Merge pull request #30372 from vespa-engine/balder/common-compress-1.26

Revert "Revert "Update dependency org.apache.commons:commons-compress…

4 files changed, 7 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 5116898b795..07a8179732f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -1107,7 +1107,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     private File decompressApplication(CompressedApplicationInputStream in, File tempDir) {
         try {
             return in.decompress(tempDir);
-        } catch (IOException e) {
+        } catch (IOException | UncheckedIOException e) {
             throw new IllegalArgumentException("Unable to decompress application stream", e);
         }
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
index d4aa0676c4f..07b7fa0f244 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
@@ -180,7 +180,7 @@ class ApplicationApiHandlerTest {
                        """
                        {
                          "error-code": "BAD_REQUEST",
-                         "message": "Error preprocessing application package for test.default, session 2: services.xml does not exist in application package"
+                         "message": "Unable to decompress application stream: Cannot find zip signature within the file"
                        }
                        """);
     }
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 30a940d6b7f..0078a991a1a 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -87,7 +87,7 @@
         <commons-lang3.vespa.version>3.14.0</commons-lang3.vespa.version>
         <commons-logging.vespa.version>1.3.0</commons-logging.vespa.version>  <!-- Bindings exported by jdisc through jcl-over-slf4j. -->
         <commons.math3.vespa.version>3.6.1</commons.math3.vespa.version>
-        <commons-compress.vespa.version>1.25.0</commons-compress.vespa.version>
+        <commons-compress.vespa.version>1.26.0</commons-compress.vespa.version>
         <commons-cli.vespa.version>1.6.0</commons-cli.vespa.version>
         <curator.vespa.version>5.6.0</curator.vespa.version>
         <dropwizard.metrics.vespa.version>4.2.25</dropwizard.metrics.vespa.version> <!-- ZK 3.9.1 requires this -->
diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml
index ebf79c00714..d6877451a71 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -47,6 +47,10 @@
             <artifactId>commons-compress</artifactId>
         </dependency>
         <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>