diff options
| author | Harald Musum <musum@yahooinc.com> | 2024-02-20 22:26:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-20 22:26:18 +0100 |
| commit | 69980e4b2d685f90fed30ee887ef72391d240ef2 (patch) | |
| tree | dfe1e7ab465fce386a05230cc92f360bb7d04cce | |
| parent | 3f034b18523eb04bbaf687ddc37c4afe2a4d63f9 (diff) | |
| parent | c661b405737a71ba9b73903cf587a5b3c918cfcb (diff) | |
Merge pull request #30354 from vespa-engine/revert-30348-renovate/commons-compress.vespa.version
Revert "Update dependency org.apache.commons:commons-compress to v1.26.0" MERGEOK
4 files changed, 3 insertions, 7 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 a718ca951f5..32f4d2b653c 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 @@ -1113,7 +1113,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye private File decompressApplication(CompressedApplicationInputStream in, File tempDir) { try { return in.decompress(tempDir); - } catch (IOException | UncheckedIOException e) { + } catch (IOException 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 07b7fa0f244..d4aa0676c4f 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": "Unable to decompress application stream: Cannot find zip signature within the file" + "message": "Error preprocessing application package for test.default, session 2: services.xml does not exist in application package" } """); } diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index b3f63a67f17..a60592fc85b 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.26.0</commons-compress.vespa.version> + <commons-compress.vespa.version>1.25.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 d6877451a71..ebf79c00714 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -47,10 +47,6 @@ <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> |