Merge pull request #36035 from vespa-engine/arnej/update-maven-codehaus-plexus

Arnej/update maven codehaus plexus

Author: arnej27959

bundle-plugin/pom.xml

@@ -65,6 +65,20 @@
             <artifactId>maven-shade-plugin</artifactId>
             <version>${maven-shade-plugin.vespa.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-xml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-api-xml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>maven-api-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
@@ -87,11 +101,7 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-xml-impl</artifactId>
-            <scope>provided</scope> <!-- maven complains if not provided scope. Reason unknown.-->
-        </dependency>
+
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java

@@ -12,6 +12,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
 
 import java.io.File;
 import java.nio.channels.Channels;
@@ -38,7 +39,9 @@ abstract class AbstractAssembleBundleMojo extends AbstractMojo {
 
     void addDirectory(JarArchiver jarArchiver, Path directory) {
         if (java.nio.file.Files.isDirectory(directory)) {
-            jarArchiver.addDirectory(directory.toFile());
+            PlexusIoFileResourceCollection resources = new PlexusIoFileResourceCollection();
+            resources.setBaseDir(directory.toFile());
+            jarArchiver.addResources(resources);
         }
     }
 

bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java

@@ -12,7 +12,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Requirement;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -52,7 +51,6 @@ public class GenerateSourcesMojo extends AbstractMojo {
     protected MavenSession session;
 
     @Inject
-    @Requirement
     private BuildPluginManager pluginManager;
 
     @Parameter

dependency-versions/pom.xml

@@ -123,6 +123,7 @@
         <luben.zstd.vespa.version>1.5.6-4</luben.zstd.vespa.version>
         <lucene.vespa.version>9.11.1</lucene.vespa.version>
         <maven-archiver.vespa.version>3.6.2</maven-archiver.vespa.version>
+        <maven-api.vespa.version>4.0.0-rc-5</maven-api.vespa.version>
         <maven-wagon.vespa.version>3.5.3</maven-wagon.vespa.version>
         <maven-xml-impl.vespa.version>4.0.0-beta-3</maven-xml-impl.vespa.version>
         <mcp-sdk.vespa.version>0.11.2</mcp-sdk.vespa.version>
@@ -142,12 +143,12 @@
         <org.json.vespa.version>20240303</org.json.vespa.version>
         <at.yawk.lz4.vespa.version>1.10.1</at.yawk.lz4.vespa.version>
         <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version>
-        <plexus-archiver.vespa.version>4.10.0</plexus-archiver.vespa.version>
-        <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version>
-        <plexus-io.vespa.version>3.5.0</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>
+        <plexus-archiver.vespa.version>4.11.0</plexus-archiver.vespa.version>
+        <plexus-interpolation.vespa.version>1.29</plexus-interpolation.vespa.version>
+        <plexus-io.vespa.version>3.6.0</plexus-io.vespa.version>
+        <plexus-utils.vespa.version>4.0.2</plexus-utils.vespa.version>
+        <plexus-xml.vespa.version>4.1.1</plexus-xml.vespa.version>
+        <plexus-classworlds.vespa.version>2.9.0</plexus-classworlds.vespa.version>
         <proto-google-common-protos.vespa.version>2.51.0</proto-google-common-protos.vespa.version>
         <protobuf.vespa.version>3.25.5</protobuf.vespa.version>
         <questdb.vespa.version>7.4.2</questdb.vespa.version>
@@ -182,10 +183,10 @@
         <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.9</maven-core.vespa.version>
+        <maven-core.vespa.version>3.9.12</maven-core.vespa.version>
         <maven-dependency-plugin.vespa.version>3.8.1</maven-dependency-plugin.vespa.version>
         <maven-deploy-plugin.vespa.version>3.1.4</maven-deploy-plugin.vespa.version>
-        <maven-enforcer-plugin.vespa.version>3.6.1</maven-enforcer-plugin.vespa.version>
+        <maven-enforcer-plugin.vespa.version>3.6.2</maven-enforcer-plugin.vespa.version>
         <maven-failsafe-plugin.vespa.version>3.3.1</maven-failsafe-plugin.vespa.version>
         <maven-gpg-plugin.vespa.version>3.2.7</maven-gpg-plugin.vespa.version>
         <maven-install-plugin.vespa.version>3.1.2</maven-install-plugin.vespa.version>

maven-plugins/allowed-maven-dependencies.txt

@@ -9,12 +9,10 @@ com.github.luben:zstd-jni:${luben.zstd.vespa.version}
 com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version}
 com.google.guava:failureaccess:${failureaccess.vespa.version}
 com.google.guava:guava:${guava.vespa.version}
-com.google.inject:guice:${guice.vespa.version}
+com.google.inject:guice:5.1.0:classes
 com.google.j2objc:j2objc-annotations:${j2objc-annotations.vespa.version}
 commons-codec:commons-codec:${commons-codec.vespa.version}
 commons-io:commons-io:${commons-io.vespa.version}
-io.airlift:aircompressor:${aircompressor.vespa.version}
-jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}
 javax.inject:javax.inject:${javax.inject.vespa.version}
 junit:junit:${junit4.vespa.version}
 net.bytebuddy:byte-buddy-agent:${byte-buddy.vespa.version}
@@ -34,8 +32,8 @@ 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:${maven-dependency-tree.vespa.version}
 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-api-annotations:${maven-api.vespa.version}
+org.apache.maven:maven-api-xml:${maven-api.vespa.version}
 org.apache.maven:maven-archiver:${maven-archiver.vespa.version}
 org.apache.maven:maven-artifact:${maven-core.vespa.version}
 org.apache.maven:maven-builder-support:${maven-core.vespa.version}
@@ -47,12 +45,12 @@ org.apache.maven:maven-repository-metadata:${maven-core.vespa.version}
 org.apache.maven:maven-resolver-provider:${maven-core.vespa.version}
 org.apache.maven:maven-settings-builder:${maven-core.vespa.version}
 org.apache.maven:maven-settings:${maven-core.vespa.version}
-org.apache.maven:maven-xml-impl:${maven-xml-impl.vespa.version}
+org.apache.maven:maven-xml:${maven-api.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:${plexus-classworlds.vespa.version}
-org.codehaus.plexus:plexus-component-annotations:2.1.0
+org.codehaus.plexus:plexus-component-annotations:2.2.0
 org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version}
 org.codehaus.plexus:plexus-io:${plexus-io.vespa.version}
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
@@ -77,6 +75,6 @@ org.ow2.asm:asm-commons:${asm.vespa.version}
 org.ow2.asm:asm-tree:${asm.vespa.version}
 org.ow2.asm:asm:${asm.vespa.version}
 org.slf4j:slf4j-api:${slf4j.vespa.version}
-org.tukaani:xz:1.9
+org.tukaani:xz:1.11
 org.twdata.maven:mojo-executor:${mojo-executor.vespa.version}
 org.vafer:jdependency:${vafer.jdependency.vespa.version}

parent/pom.xml

@@ -1077,6 +1077,11 @@
                 <artifactId>maven-xml-impl</artifactId>
                 <version>${maven-xml-impl.vespa.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-api-xml</artifactId>
+                <version>${maven-api.vespa.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven.enforcer</groupId>
                 <artifactId>enforcer-api</artifactId>

vespa-dependencies-enforcer/allowed-maven-dependencies.txt

@@ -180,7 +180,6 @@ org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}
 org.eclipse.jetty:jetty-server:${jetty.vespa.version}
 org.eclipse.jetty:jetty-util:${jetty.client.vespa.version}
 org.eclipse.jetty:jetty-util:${jetty.vespa.version}
-org.eclipse.sisu:org.eclipse.sisu.inject:${eclipse-sisu.vespa.version}
 org.eclipse.sisu:org.eclipse.sisu.plexus:${eclipse-sisu.vespa.version}
 org.hamcrest:hamcrest-core:${hamcrest.vespa.version}
 org.hamcrest:hamcrest:${hamcrest.vespa.version}
@@ -226,7 +225,7 @@ org.slf4j:slf4j-jdk14:${slf4j.vespa.version}
 org.slf4j:slf4j-simple:${slf4j.vespa.version}
 org.testcontainers:junit-jupiter:${testcontainers.vespa.version}
 org.testcontainers:testcontainers:${testcontainers.vespa.version}
-org.tukaani:xz:1.9
+org.tukaani:xz:1.11
 org.wiremock:wiremock-standalone:${wiremock.vespa.version}
 org.xerial.snappy:snappy-java:${snappy.vespa.version}
 org.yaml:snakeyaml:${snakeyaml.vespa.version}