From be0c9d65a0d8fe286c623cf3d5b3a9dd07242ca4 Mon Sep 17 00:00:00 2001
From: Kyle Scully <scullykns@gmail.com>
Date: Tue, 27 Feb 2024 17:30:56 -0800
Subject: [PATCH] chore: update suppression & resolve latest commons-compress

---
 build.gradle.kts | 12 ++++++++++--
 suppressions.xml |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3d0806c..c12d2b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -117,11 +117,19 @@ repositories {
 
 configurations.all {
     resolutionStrategy {
+        eachDependency {
+            if (requested.group == "org.apache.commons"
+                && requested.name == "commons-compress"
+                && requested.version.toString().startsWith("1.25")
+            ) {
+                useVersion("1.26.0")
+            }
+        }
         cacheChangingModulesFor(0, TimeUnit.SECONDS)
         cacheDynamicVersionsFor(0, TimeUnit.SECONDS)
-        if(name.startsWith("test")) {
+        if (name.startsWith("test")) {
             eachDependency {
-                if(requested.name == "groovy-xml") {
+                if (requested.name == "groovy-xml") {
                     useVersion("3.0.9")
                 }
             }
diff --git a/suppressions.xml b/suppressions.xml
index 594d06f..4a52f47 100644
--- a/suppressions.xml
+++ b/suppressions.xml
@@ -75,7 +75,7 @@
         <cve>CVE-2023-44387</cve>
         <cve>CVE-2023-49238</cve>
     </suppress>
-    <suppress until="2024-02-28Z">
+    <suppress until="2024-03-28Z">
         <notes><![CDATA[
         file name: spring-asm-3.1.3.RELEASE.jar
         ]]></notes>
@@ -100,7 +100,7 @@
         <cve>CVE-2014-3625</cve>
         <cve>CVE-2014-1904</cve>
     </suppress>
-    <suppress until="2024-02-28Z">
+    <suppress until="2024-03-28Z">
         <notes><![CDATA[
         file name: spring-core-3.1.3.RELEASE.jar
         ]]></notes>
@@ -125,7 +125,7 @@
         <cve>CVE-2014-3625</cve>
         <cve>CVE-2014-1904</cve>
     </suppress>
-    <suppress until="2024-02-28Z">
+    <suppress until="2024-03-28Z">
         <notes><![CDATA[
            sev: HIGH
            file name: plexus-interpolation-1.14.jar
@@ -135,7 +135,7 @@
         <cve>CVE-2022-4244</cve>
         <cve>CVE-2022-4245</cve>
     </suppress>
-    <suppress until="2024-02-28Z">
+    <suppress until="2024-03-28Z">
         <notes><![CDATA[
         sev: HIGH
         file name: plexus-component-annotations-1.5.5.jar