Merge pull request #28211 from vespa-engine/renovate/maven-archiver.vespa.version

Update dependency org.apache.maven:maven-archiver to v3.6.1

3 files changed, 9 insertions, 8 deletions

diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index e05bdae3f48..d156491f28e 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -98,7 +98,7 @@
         <junit.platform.vespa.version>1.8.1</junit.platform.vespa.version>
         <junit4.vespa.version>4.13.2</junit4.vespa.version>
         <lucene.vespa.version>9.7.0</lucene.vespa.version>
-        <maven-archiver.vespa.version>3.6.0</maven-archiver.vespa.version>
+        <maven-archiver.vespa.version>3.6.1</maven-archiver.vespa.version>
         <maven-wagon.vespa.version>2.12</maven-wagon.vespa.version>
         <mimepull.vespa.version>1.9.6</mimepull.vespa.version>
         <mockito.vespa.version>4.0.0</mockito.vespa.version>
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index 6b5b643e820..3943f6e9ad6 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -6,6 +6,7 @@ aopalliance:aopalliance:1.0
 com.fasterxml.jackson.core:jackson-annotations:2.15.2
 com.fasterxml.jackson.core:jackson-core:2.15.2
 com.fasterxml.jackson.core:jackson-databind:2.15.2
+com.github.luben:zstd-jni:1.5.5-4
 com.google.errorprone:error_prone_annotations:2.18.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:32.1.1-jre
@@ -19,7 +20,7 @@ org.apache-extras.beanshell:bsh:2.0b6
 org.apache.commons:commons-collections4:4.4
 org.apache.commons:commons-compress:1.23.0
 org.apache.commons:commons-lang3:3.12.0
-org.apache.maven:maven-archiver:3.6.0
+org.apache.maven:maven-archiver:3.6.1
 org.apache.maven:maven-artifact:3.9.4
 org.apache.maven:maven-builder-support:3.9.4
 org.apache.maven:maven-core:3.9.4
@@ -41,12 +42,12 @@ org.apache.maven.resolver:maven-resolver-spi:1.9.14
 org.apache.maven.resolver:maven-resolver-util:1.9.14
 org.apache.maven.shared:maven-dependency-tree:3.2.1
 org.apache.maven.shared:maven-shared-utils:3.3.4
-org.codehaus.plexus:plexus-archiver:4.4.0
+org.codehaus.plexus:plexus-archiver:4.8.0
 org.codehaus.plexus:plexus-cipher:2.0
 org.codehaus.plexus:plexus-classworlds:2.7.0
 org.codehaus.plexus:plexus-component-annotations:2.1.0
 org.codehaus.plexus:plexus-interpolation:1.26
-org.codehaus.plexus:plexus-io:3.4.0
+org.codehaus.plexus:plexus-io:3.4.1
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
 org.codehaus.plexus:plexus-utils:3.5.1
 org.eclipse.aether:aether-api:1.0.0.v20140518
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 2bd657fffec..75f11b76532 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -23,6 +23,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.2
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2
+com.github.luben:zstd-jni:1.5.5-4
 com.github.spotbugs:spotbugs-annotations:3.1.9
 com.google.auth:google-auth-library-credentials:1.19.0
 com.google.auth:google-auth-library-oauth2-http:1.19.0
@@ -110,7 +111,7 @@ org.apache.httpcomponents.core5:httpcore5:5.2.2
 org.apache.httpcomponents.core5:httpcore5-h2:5.2.2
 org.apache.lucene:lucene-analysis-common:9.7.0
 org.apache.lucene:lucene-core:9.7.0
-org.apache.maven:maven-archiver:3.6.0
+org.apache.maven:maven-archiver:3.6.1
 org.apache.maven:maven-artifact:3.9.4
 org.apache.maven:maven-artifact-manager:2.2.1
 org.apache.maven:maven-model:3.9.4
@@ -135,12 +136,12 @@ org.apiguardian:apiguardian-api:1.1.2
 org.bouncycastle:bcpkix-jdk18on:1.74
 org.bouncycastle:bcprov-jdk18on:1.74
 org.bouncycastle:bcutil-jdk18on:1.74
-org.codehaus.plexus:plexus-archiver:4.4.0
+org.codehaus.plexus:plexus-archiver:4.8.0
 org.codehaus.plexus:plexus-classworlds:2.7.0
 org.codehaus.plexus:plexus-component-annotations:1.5.5
 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
 org.codehaus.plexus:plexus-interpolation:1.26
-org.codehaus.plexus:plexus-io:3.4.0
+org.codehaus.plexus:plexus-io:3.4.1
 org.codehaus.plexus:plexus-utils:3.5.1
 org.eclipse.collections:eclipse-collections:11.0.0
 org.eclipse.collections:eclipse-collections-api:11.0.0
@@ -216,7 +217,6 @@ xml-apis:xml-apis:1.4.01
 
 #[test-only]
 # Contains dependencies that are used exclusively in 'test' scope
-com.github.luben:zstd-jni:1.5.5-4
 com.github.tomakehurst:wiremock-jre8-standalone:2.35.0
 com.google.guava:guava-testlib:32.1.1-jre
 com.google.inject:guice:4.2.3