diff --git a/droid-api/dependency-check/suppressions.xml b/droid-api/dependency-check/suppressions.xml
index 65b9e0e1c..47b1e5bd0 100644
--- a/droid-api/dependency-check/suppressions.xml
+++ b/droid-api/dependency-check/suppressions.xml
@@ -1,53 +1,4 @@
-
-
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
-
diff --git a/droid-binary/dependency-check/suppressions.xml b/droid-binary/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-binary/dependency-check/suppressions.xml
+++ b/droid-binary/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-command-line/dependency-check/suppressions.xml b/droid-command-line/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-command-line/dependency-check/suppressions.xml
+++ b/droid-command-line/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-export/dependency-check/suppressions.xml b/droid-export/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-export/dependency-check/suppressions.xml
+++ b/droid-export/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-parent/dependency-check/suppressions.xml b/droid-parent/dependency-check/suppressions.xml
index 65b9e0e1c..47b1e5bd0 100644
--- a/droid-parent/dependency-check/suppressions.xml
+++ b/droid-parent/dependency-check/suppressions.xml
@@ -1,53 +1,4 @@
-
-
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
-
diff --git a/droid-report-interfaces/dependency-check/suppressions.xml b/droid-report-interfaces/dependency-check/suppressions.xml
index 51734c0cf..67d14be5b 100644
--- a/droid-report-interfaces/dependency-check/suppressions.xml
+++ b/droid-report-interfaces/dependency-check/suppressions.xml
@@ -1,52 +1,10 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-report/dependency-check/suppressions.xml b/droid-report/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-report/dependency-check/suppressions.xml
+++ b/droid-report/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-results/dependency-check/suppressions.xml b/droid-results/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-results/dependency-check/suppressions.xml
+++ b/droid-results/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337
diff --git a/droid-swing-ui/dependency-check/suppressions.xml b/droid-swing-ui/dependency-check/suppressions.xml
index 65b9e0e1c..4228988f8 100644
--- a/droid-swing-ui/dependency-check/suppressions.xml
+++ b/droid-swing-ui/dependency-check/suppressions.xml
@@ -1,53 +1,11 @@
-
+
- ^pkg:maven/org\.springframework/spring\-core@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-tx@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-aop@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-jdbc@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-beans@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-context@.*$
- CVE-2016-1000027
-
-
-
- ^pkg:maven/org\.springframework/spring\-expression@.*$
- CVE-2016-1000027
+ ^pkg:maven/org\.apache\.derby/derby@.*$
+ CVE-2022-46337