Merge pull request #30370 from vespa-engine/renovate/maven-shade-plugin.vespa.version

Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.2

4 files changed, 23 insertions, 4 deletions

diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 3635279e4fd..237a6de6550 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -129,6 +129,8 @@
         <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version>
         <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version>
         <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version>
+        <plexus-utils.vespa.version>3.5.1</plexus-utils.vespa.version>
+        <plexus-xml.vespa.version>3.0.0</plexus-xml.vespa.version>
         <protobuf.vespa.version>3.25.3</protobuf.vespa.version>
         <questdb.vespa.version>7.3.10</questdb.vespa.version>
         <spifly.vespa.version>1.3.7</spifly.vespa.version>
@@ -142,6 +144,7 @@
         <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version>
         <zookeeper.client.vespa.version>3.9.1</zookeeper.client.vespa.version>
         <zookeeper.client.artifactId>zookeeper-server-3.9.1</zookeeper.client.artifactId>
+        <vafer.jdependency.vespa.version>2.10</vafer.jdependency.vespa.version>
 
         <!-- Versions used by tenant parent pom and testing framework -->
         <!-- CAUTION: upgrading junit for tenants poms may break testing frameworks -->
@@ -170,7 +173,7 @@
         <maven-plugin-tools.vespa.version>3.11.0</maven-plugin-tools.vespa.version>
         <maven-resources-plugin.vespa.version>3.3.1</maven-resources-plugin.vespa.version>
         <maven-resolver.vespa.version>1.9.18</maven-resolver.vespa.version>
-        <maven-shade-plugin.vespa.version>3.5.1</maven-shade-plugin.vespa.version>
+        <maven-shade-plugin.vespa.version>3.5.2</maven-shade-plugin.vespa.version>
         <maven-site-plugin.vespa.version>3.12.1</maven-site-plugin.vespa.version>
         <maven-source-plugin.vespa.version>3.3.0</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 85531c74863..c63b1e0863f 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -52,7 +52,8 @@ org.codehaus.plexus:plexus-component-annotations:2.1.0
 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version}
 org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version}
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
-org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version}
+org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version}
+org.codehaus.plexus:plexus-xml:${plexus-xml.vespa.version}
 org.eclipse.aether:aether-api:1.0.0.v20140518
 org.eclipse.aether:aether-util:1.0.0.v20140518
 org.eclipse.sisu:org.eclipse.sisu.inject:${eclipse-sisu.vespa.version}
@@ -76,4 +77,4 @@ org.ow2.asm:asm:${asm.vespa.version}
 org.slf4j:slf4j-api:${slf4j.vespa.version}
 org.tukaani:xz:1.9
 org.twdata.maven:mojo-executor:${mojo-executor.vespa.version}
-org.vafer:jdependency:2.9.0
+org.vafer:jdependency:${vafer.jdependency.vespa.version}
diff --git a/parent/pom.xml b/parent/pom.xml
index d020cfbd662..780d05241be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -526,6 +526,11 @@
                 <version>${spotbugs.vespa.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.vafer</groupId>
+                <artifactId>jdependency</artifactId>
+                <version>${vafer.jdependency.vespa.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.wiremock</groupId>
                 <artifactId>wiremock-standalone</artifactId>
                 <version>${wiremock.vespa.version}</version>
@@ -997,6 +1002,16 @@
                 <version>${plexus-interpolation.vespa.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>${plexus-utils.vespa.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-xml</artifactId>
+                <version>${plexus-xml.vespa.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk18on</artifactId>
                 <version>${bouncycastle.vespa.version}</version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 9b1bc20fd7d..04de64414eb 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -137,7 +137,7 @@ 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}
 org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version}
-org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version}
+org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version}
 org.eclipse.angus:angus-activation:${jakarta.inject.vespa.version}
 org.eclipse.collections:eclipse-collections-api:${eclipse-collections.vespa.version}
 org.eclipse.collections:eclipse-collections:${eclipse-collections.vespa.version}