Merge pull request #31329 from vespa-engine/renovate/maven-core.vespa.version

Update maven-core.vespa.version to v3.9.7

4 files changed, 16 insertions, 4 deletions

diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 8d35cd2930c..0e7921f050a 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -139,6 +139,7 @@
         <plexus-io.vespa.version>3.4.2</plexus-io.vespa.version>
         <plexus-utils.vespa.version>4.0.1</plexus-utils.vespa.version>
         <plexus-xml.vespa.version>4.0.4</plexus-xml.vespa.version>
+        <plexus-classworlds.vespa.version>2.8.0</plexus-classworlds.vespa.version>
         <protobuf.vespa.version>3.25.3</protobuf.vespa.version>
         <questdb.vespa.version>7.4.2</questdb.vespa.version>
         <spifly.vespa.version>1.3.7</spifly.vespa.version>
@@ -169,7 +170,7 @@
         <maven-assembly-plugin.vespa.version>3.7.1</maven-assembly-plugin.vespa.version>
         <maven-bundle-plugin.vespa.version>5.1.9</maven-bundle-plugin.vespa.version>
         <maven-compiler-plugin.vespa.version>3.13.0</maven-compiler-plugin.vespa.version>
-        <maven-core.vespa.version>3.9.6</maven-core.vespa.version>
+        <maven-core.vespa.version>3.9.7</maven-core.vespa.version>
         <maven-dependency-plugin.vespa.version>3.6.1</maven-dependency-plugin.vespa.version>
         <maven-deploy-plugin.vespa.version>3.1.2</maven-deploy-plugin.vespa.version>
         <maven-enforcer-plugin.vespa.version>3.4.1</maven-enforcer-plugin.vespa.version>
@@ -183,6 +184,7 @@
         <maven-resources-plugin.vespa.version>3.3.1</maven-resources-plugin.vespa.version>
         <maven-resolver.vespa.version>1.9.20</maven-resolver.vespa.version>
         <maven-shade-plugin.vespa.version>3.5.3</maven-shade-plugin.vespa.version>
+        <maven-shared-utils.vespa.version>3.4.2</maven-shared-utils.vespa.version>
         <maven-site-plugin.vespa.version>3.12.1</maven-site-plugin.vespa.version>
         <maven-source-plugin.vespa.version>3.3.1</maven-source-plugin.vespa.version>
         <properties-maven-plugin.vespa.version>1.2.1</properties-maven-plugin.vespa.version>
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index 60cf163a8b4..6245caf1d92 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -33,7 +33,7 @@ org.apache.maven.resolver:maven-resolver-named-locks:${maven-resolver.vespa.vers
 org.apache.maven.resolver:maven-resolver-spi:${maven-resolver.vespa.version}
 org.apache.maven.resolver:maven-resolver-util:${maven-resolver.vespa.version}
 org.apache.maven.shared:maven-dependency-tree:3.2.1
-org.apache.maven.shared:maven-shared-utils:3.3.4
+org.apache.maven.shared:maven-shared-utils:${maven-shared-utils.vespa.version}
 org.apache.maven:maven-api-meta:${maven-xml-impl.vespa.version}
 org.apache.maven:maven-api-xml:${maven-xml-impl.vespa.version}
 org.apache.maven:maven-archiver:${maven-archiver.vespa.version}
@@ -51,7 +51,7 @@ org.apache.maven:maven-xml-impl:${maven-xml-impl.vespa.version}
 org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
 org.codehaus.plexus:plexus-archiver:${plexus-archiver.vespa.version}
 org.codehaus.plexus:plexus-cipher:2.0
-org.codehaus.plexus:plexus-classworlds:2.7.0
+org.codehaus.plexus:plexus-classworlds:${plexus-classworlds.vespa.version}
 org.codehaus.plexus:plexus-component-annotations:2.1.0
 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version}
 org.codehaus.plexus:plexus-io:${plexus-io.vespa.version}
diff --git a/parent/pom.xml b/parent/pom.xml
index 2d7a20b91ca..eec97060a88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -918,6 +918,11 @@
                 <version>3.2.1</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.maven.shared</groupId>
+                <artifactId>maven-shared-utils</artifactId>
+                <version>${maven-shared-utils.vespa.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit4</artifactId>
                 <version>${surefire.vespa.version}</version>
@@ -1005,6 +1010,11 @@
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-classworlds</artifactId>
+                <version>${plexus-classworlds.vespa.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-interpolation</artifactId>
                 <version>${plexus-interpolation.vespa.version}</version>
             </dependency>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 7519f3a5211..2e45e28d5e7 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -130,7 +130,7 @@ org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}
 org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}
 org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}
 org.codehaus.plexus:plexus-archiver:${plexus-archiver.vespa.version}
-org.codehaus.plexus:plexus-classworlds:2.7.0
+org.codehaus.plexus:plexus-classworlds:${plexus-classworlds.vespa.version}
 org.codehaus.plexus:plexus-component-annotations:2.1.0
 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version}