Release: Merge release into master from: release/2.48.4 (#12838)

* Update versions in application files

* Reimport: Restore default for `close_old_findings` to `True` (#12837)

As part of #12782 the default value for `close_old_findings` was swapped from `True` to `False`. This PR restores that functionality

* Update versions in application files

---------

Co-authored-by: DefectDojo release bot <[email protected]>
Co-authored-by: Cody Maffucci <[email protected]>

Author: Maffooch

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.48.3",
+  "version": "2.48.4",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = "2.48.3"
+__version__ = "2.48.4"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

dojo/api_v2/serializers.py

@@ -2383,7 +2383,7 @@ class ReImportScanSerializer(CommonImportScanSerializer):
     # also for ReImport.
     close_old_findings = serializers.BooleanField(
         required=False,
-        default=False,
+        default=True,
         help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
                     "If service has been set, only the findings for this service will be closed. "
                     "This only affects findings within the same test.",

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.48.3"
+appVersion: "2.48.4"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.198
+version: 1.6.199
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap