Upgrade to Maven 4.0.0-beta-3

Author: gnodet

.github/workflows/maven-verify.yml

@@ -24,4 +24,7 @@ on:
 jobs:
   build:
     name: Verify
-    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
+    with:
+      ff-maven: "4.0.0-beta-3"                     # Maven version for fail-fast-build
+      maven-matrix: '[ "4.0.0-beta-3" ]'

pom.xml

@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>41</version>
+    <version>42</version>
     <relativePath />
   </parent>
 
@@ -77,8 +77,8 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <javaVersion>8</javaVersion>
-    <mavenVersion>4.0.0-alpha-12</mavenVersion>
+    <javaVersion>17</javaVersion>
+    <mavenVersion>4.0.0-beta-3</mavenVersion>
     <project.build.outputTimestamp>2023-05-17T21:31:27Z</project.build.outputTimestamp>
   </properties>
 
@@ -141,7 +141,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.10.3-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>

src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java

@@ -28,10 +28,11 @@
 import java.util.List;
 import java.util.Objects;
 
-import jakarta.inject.Inject;
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Project;
 import org.apache.maven.api.Session;
+import org.apache.maven.api.Type;
+import org.apache.maven.api.di.Inject;
 import org.apache.maven.api.model.Resource;
 import org.apache.maven.api.plugin.Log;
 import org.apache.maven.api.plugin.Mojo;
@@ -152,12 +153,6 @@ public abstract class AbstractSourceJarMojo implements Mojo {
     @Parameter(property = "maven.source.includePom", defaultValue = "false")
     protected boolean includePom;
 
-    /**
-     * Used for attaching the source jar to the project.
-     */
-    @Inject
-    protected ProjectManager projectManager;
-
     /**
      * The directory where the generated archive file will be put.
      */
@@ -174,7 +169,7 @@ public abstract class AbstractSourceJarMojo implements Mojo {
     /**
      * Contains the full list of projects in the reactor.
      */
-    @Parameter(defaultValue = "${reactorProjects}", readonly = true)
+    @Parameter(defaultValue = "${session.projects}", readonly = true)
     protected List<Project> reactorProjects;
 
     /**
@@ -214,6 +209,11 @@ public abstract class AbstractSourceJarMojo implements Mojo {
     @Inject
     protected Log log;
 
+    /**
+     * Used for attaching the source jar to the project.
+     */
+    protected ProjectManager projectManager;
+
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------
@@ -231,6 +231,11 @@ public void execute() throws MojoException {
             return;
         }
 
+        projectManager = session.getService(ProjectManager.class);
+        doExecute();
+    }
+
+    protected void doExecute() {
         packageSources(project);
     }
 
@@ -248,7 +253,7 @@ public void execute() throws MojoException {
      * @return the compile or test sources
      * @throws MojoException in case of an error.
      */
-    protected abstract List<String> getSources(Project p) throws MojoException;
+    protected abstract List<Path> getSources(Project p) throws MojoException;
 
     /**
      * @param p {@link Project} not null
@@ -262,7 +267,8 @@ public void execute() throws MojoException {
      * @throws MojoException in case of an error.
      */
     protected void packageSources(Project p) throws MojoException {
-        if (!"pom".equals(p.getPackaging()) && !"bom".equals(p.getPackaging())) {
+        String type = p.getPackaging().type().id();
+        if (!Type.POM.equals(type) && !Type.BOM.equals(type)) {
             packageSources(Collections.singletonList(p));
         }
     }
@@ -272,10 +278,11 @@ protected void packageSources(Project p) throws MojoException {
      * @throws MojoException in case of an error.
      */
     protected void packageSources(List<Project> theProjects) throws MojoException {
-        if (!project.getArtifact().getClassifier().isEmpty()) {
+        Artifact currentProjectArtifact = project.getMainArtifact().get();
+        if (!currentProjectArtifact.getClassifier().isEmpty()) {
             getLog().warn("NOT adding sources to artifacts with classifier as Maven only supports one classifier "
-                    + "per artifact. Current artifact [" + project.getArtifact().key() + "] has a ["
-                    + project.getArtifact().getClassifier() + "] classifier.");
+                    + "per artifact. Current artifact [" + currentProjectArtifact.key() + "] has a ["
+                    + currentProjectArtifact.getClassifier() + "] classifier.");
 
             return;
         }
@@ -285,7 +292,8 @@ protected void packageSources(List<Project> theProjects) throws MojoException {
         for (Project pItem : theProjects) {
             Project subProject = getProject(pItem);
 
-            if ("pom".equals(subProject.getPackaging()) || "bom".equals(subProject.getPackaging())) {
+            String type = subProject.getPackaging().type().id();
+            if (Type.POM.equals(type) || Type.BOM.equals(type)) {
                 continue;
             }
 
@@ -344,17 +352,14 @@ protected void packageSources(List<Project> theProjects) throws MojoException {
     protected void archiveProjectContent(Project project, Archiver archiver) throws MojoException {
         if (includePom) {
             try {
-                File pom = project.getPomPath().get().toFile();
+                File pom = project.getPomPath().toFile();
                 archiver.addFile(pom, pom.getName());
             } catch (ArchiverException e) {
                 throw new MojoException("Error adding POM file to target jar file.", e);
             }
         }
 
-        for (String s : getSources(project)) {
-
-            Path sourceDirectory = Paths.get(s);
-
+        for (Path sourceDirectory : getSources(project)) {
             if (Files.exists(sourceDirectory)) {
                 addDirectory(archiver, sourceDirectory, getCombinedIncludes(null), getCombinedExcludes(null));
             }

src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java

@@ -18,25 +18,25 @@
  */
 package org.apache.maven.plugins.source;
 
+import org.apache.maven.api.Type;
 import org.apache.maven.api.plugin.MojoException;
 import org.apache.maven.api.plugin.annotations.Execute;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 
 /**
  * Aggregate sources for all modules in an aggregator project.
  *
  * @since 2.0.3
  */
-@Mojo(name = "aggregate", defaultPhase = LifecyclePhase.PACKAGE, aggregator = true)
-@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "aggregate", defaultPhase = "package", aggregator = true)
+@Execute(phase = "generate-sources")
 public class AggregatorSourceJarMojo extends SourceJarMojo {
     /**
      * {@inheritDoc}
      */
     @Override
-    public void execute() throws MojoException {
-        if ("pom".equals(getProject().getPackaging())) {
+    protected void doExecute() throws MojoException {
+        if (Type.POM.equals(getProject().getPackaging().type().id())) {
             packageSources(reactorProjects);
         }
     }

src/main/java/org/apache/maven/plugins/source/Archivers.java

@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.plugins.source;
+
+import org.apache.maven.api.di.Named;
+import org.apache.maven.api.di.Provides;
+import org.apache.maven.api.di.Singleton;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+
+@Named
+public class Archivers {
+
+    @Provides
+    @Singleton
+    @Named("jar")
+    static JarArchiver createJarArchiver() {
+        return new JarArchiver();
+    }
+}

src/main/java/org/apache/maven/plugins/source/SourceJarMojo.java

@@ -19,7 +19,6 @@
 package org.apache.maven.plugins.source;
 
 import org.apache.maven.api.plugin.annotations.Execute;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 
 /**
@@ -28,8 +27,8 @@
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @since 2.0.3
  */
-@Mojo(name = "jar", defaultPhase = LifecyclePhase.PACKAGE)
-@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "jar", defaultPhase = "package")
+@Execute(phase = "generate-sources")
 public class SourceJarMojo extends SourceJarNoForkMojo {
     // no op
 }

src/main/java/org/apache/maven/plugins/source/SourceJarNoForkMojo.java

@@ -18,12 +18,13 @@
  */
 package org.apache.maven.plugins.source;
 
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.api.Project;
+import org.apache.maven.api.ProjectScope;
 import org.apache.maven.api.model.Resource;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 import org.apache.maven.api.plugin.annotations.Parameter;
 
@@ -34,7 +35,7 @@
  * @author pgier
  * @since 2.1
  */
-@Mojo(name = "jar-no-fork", defaultPhase = LifecyclePhase.PACKAGE)
+@Mojo(name = "jar-no-fork", defaultPhase = "package")
 public class SourceJarNoForkMojo extends AbstractSourceJarMojo {
     /**
      * @since 2.2
@@ -45,8 +46,8 @@ public class SourceJarNoForkMojo extends AbstractSourceJarMojo {
     /**
      * {@inheritDoc}
      */
-    protected List<String> getSources(Project p) {
-        return projectManager.getCompileSourceRoots(p);
+    protected List<Path> getSources(Project p) {
+        return projectManager.getCompileSourceRoots(p, ProjectScope.MAIN);
     }
 
     /**
@@ -57,7 +58,7 @@ protected List<Resource> getResources(Project p) {
             return Collections.emptyList();
         }
 
-        return projectManager.getResources(p);
+        return projectManager.getResources(p, ProjectScope.MAIN);
     }
 
     /**

src/main/java/org/apache/maven/plugins/source/TestSourceGeneratedJarMojo.java

@@ -19,16 +19,15 @@
 package org.apache.maven.plugins.source;
 
 import org.apache.maven.api.plugin.annotations.Execute;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 
 /**
  * This plugin bundles all the test sources into a jar archive.
  *
  * @since 2.2
  */
-@Mojo(name = "generated-test-jar", defaultPhase = LifecyclePhase.PACKAGE)
-@Execute(phase = LifecyclePhase.GENERATE_TEST_SOURCES)
+@Mojo(name = "generated-test-jar", defaultPhase = "package")
+@Execute(phase = "generate-test-sources")
 public class TestSourceGeneratedJarMojo extends TestSourceJarNoForkMojo {
     // no op
 }

src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java

@@ -19,16 +19,15 @@
 package org.apache.maven.plugins.source;
 
 import org.apache.maven.api.plugin.annotations.Execute;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 
 /**
  * This plugin bundles all the test sources into a jar archive.
  *
  * @since 2.0.3
  */
-@Mojo(name = "test-jar", defaultPhase = LifecyclePhase.PACKAGE)
-@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "test-jar", defaultPhase = "package")
+@Execute(phase = "generate-sources")
 public class TestSourceJarMojo extends TestSourceJarNoForkMojo {
     // no op
 }

src/main/java/org/apache/maven/plugins/source/TestSourceJarNoForkMojo.java

@@ -18,12 +18,13 @@
  */
 package org.apache.maven.plugins.source;
 
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.api.Project;
+import org.apache.maven.api.ProjectScope;
 import org.apache.maven.api.model.Resource;
-import org.apache.maven.api.plugin.annotations.LifecyclePhase;
 import org.apache.maven.api.plugin.annotations.Mojo;
 import org.apache.maven.api.plugin.annotations.Parameter;
 
@@ -34,7 +35,7 @@
  *
  * @since 2.1
  */
-@Mojo(name = "test-jar-no-fork", defaultPhase = LifecyclePhase.PACKAGE)
+@Mojo(name = "test-jar-no-fork", defaultPhase = "package")
 public class TestSourceJarNoForkMojo extends AbstractSourceJarMojo {
     /**
      * @since 2.2
@@ -45,8 +46,8 @@ public class TestSourceJarNoForkMojo extends AbstractSourceJarMojo {
     /**
      * {@inheritDoc}
      */
-    protected List<String> getSources(Project p) {
-        return projectManager.getTestCompileSourceRoots(p);
+    protected List<Path> getSources(Project p) {
+        return projectManager.getCompileSourceRoots(p, ProjectScope.TEST);
     }
 
     /**
@@ -57,7 +58,7 @@ protected List<Resource> getResources(Project p) {
             return Collections.emptyList();
         }
 
-        return projectManager.getTestResources(p);
+        return projectManager.getResources(p, ProjectScope.TEST);
     }
 
     /**