Upgrade to Maven 4.0.0-rc-4. (#415)

Author: desruisseaux

.github/workflows/maven-verify.yml

@@ -26,6 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
     with:
-      ff-maven: "4.0.0-rc-2"                     # Maven version for fail-fast-build
-      maven-matrix: '[ "4.0.0-rc-2" ]'
+      ff-maven: "4.0.0-rc-4"                     # Maven version for fail-fast-build
+      maven-matrix: '[ "4.0.0-rc-4" ]'
       jdk-matrix: '[ "17", "21" ]'

pom.xml

@@ -72,13 +72,13 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenVersion>4.0.0-rc-2</mavenVersion>
+    <mavenVersion>4.0.0-rc-4</mavenVersion>
     <javaVersion>17</javaVersion>
 
     <guiceVersion>6.0.0</guiceVersion>
     <mavenFilteringVersion>4.0.0-beta-1</mavenFilteringVersion>
     <mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
-    <mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion>
+    <mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
     <plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
     <sisuVersion>0.9.0.M3</sisuVersion>
     <slf4jVersion>2.0.13</slf4jVersion>

src/main/java/org/apache/maven/plugins/resources/ResourceUtils.java

@@ -26,11 +26,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
+import org.apache.maven.api.Language;
 import org.apache.maven.api.Project;
 import org.apache.maven.api.ProjectScope;
 import org.apache.maven.api.Session;
+import org.apache.maven.api.SourceRoot;
 import org.apache.maven.api.di.Inject;
 import org.apache.maven.api.plugin.Log;
 import org.apache.maven.api.plugin.MojoException;
@@ -296,16 +297,25 @@ public void execute() throws MojoException {
             getLog().info("Skipping the execution.");
             return;
         }
-
         if (resources == null) {
-            resources = session.getService(ProjectManager.class).getResources(project, ProjectScope.MAIN).stream()
-                    .map(ResourceUtils::newResource)
-                    .collect(Collectors.toList());
+            resources = session.getService(ProjectManager.class)
+                    .getEnabledSourceRoots(project, ProjectScope.MAIN, Language.RESOURCES)
+                    .map(ResourcesMojo::newResource)
+                    .toList();
         }
-
         doExecute();
     }
 
+    static Resource newResource(SourceRoot res) {
+        Resource resource = new Resource();
+        resource.setDirectory(res.directory().toString());
+        resource.setFiltering(res.stringFiltering());
+        resource.setExcludes(res.excludes());
+        resource.setIncludes(res.includes());
+        res.targetPath().ifPresent((p) -> resource.setTargetPath(p.toString()));
+        return resource;
+    }
+
     protected void doExecute() throws MojoException {
         if ((encoding == null || encoding.isEmpty()) && isFilteringEnabled(getResources())) {
             getLog().warn("File encoding has not been set, using platform encoding "
@@ -315,14 +325,12 @@ protected void doExecute() throws MojoException {
         }
 
         try {
-            List<String> combinedFilters = getCombinedFiltersList();
-
             MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
                     getResources(),
                     getOutputDirectory(),
                     project,
                     encoding,
-                    combinedFilters,
+                    getCombinedFiltersList(),
                     Collections.emptyList(),
                     session);
 
@@ -426,7 +434,7 @@ protected List<String> getCombinedFiltersList() {
         } else {
             List<String> result = new ArrayList<>();
 
-            if (useBuildFilters && buildFilters != null && !buildFilters.isEmpty()) {
+            if (useBuildFilters && buildFilters != null) {
                 result.addAll(buildFilters);
             }
 

src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java

@@ -20,8 +20,8 @@
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.stream.Collectors;
 
+import org.apache.maven.api.Language;
 import org.apache.maven.api.ProjectScope;
 import org.apache.maven.api.plugin.MojoException;
 import org.apache.maven.api.plugin.annotations.Mojo;
@@ -66,13 +66,12 @@ public void execute() throws MojoException {
             getLog().info("Not copying test resources");
             return;
         }
-
         if (resources == null) {
-            resources = session.getService(ProjectManager.class).getResources(project, ProjectScope.TEST).stream()
-                    .map(ResourceUtils::newResource)
-                    .collect(Collectors.toList());
+            resources = session.getService(ProjectManager.class)
+                    .getEnabledSourceRoots(project, ProjectScope.TEST, Language.RESOURCES)
+                    .map(ResourcesMojo::newResource)
+                    .toList();
         }
-
         super.doExecute();
     }
 

src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java

@@ -29,7 +29,7 @@
 import org.apache.maven.api.plugin.testing.InjectMojo;
 import org.apache.maven.api.plugin.testing.MojoTest;
 import org.apache.maven.api.plugin.testing.stubs.SessionMock;
-import org.apache.maven.internal.impl.InternalSession;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
 import org.apache.maven.shared.filtering.Resource;
 import org.junit.jupiter.api.Test;

src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java

@@ -28,7 +28,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 import org.apache.maven.api.Project;
 import org.apache.maven.api.di.Provides;
@@ -37,7 +36,7 @@
 import org.apache.maven.api.plugin.testing.InjectMojo;
 import org.apache.maven.api.plugin.testing.MojoTest;
 import org.apache.maven.api.plugin.testing.stubs.SessionMock;
-import org.apache.maven.internal.impl.InternalSession;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
 import org.apache.maven.shared.filtering.Resource;
 import org.junit.jupiter.api.Test;
@@ -631,9 +630,21 @@ private static Project createProject() throws Exception {
         return new MavenProjectResourcesStub();
     }
 
-    private List<Resource> getResources(MavenProjectResourcesStub project) {
+    static List<Resource> getResources(MavenProjectResourcesStub project) {
         return project.getBuild().getResources().stream()
-                .map(ResourceUtils::newResource)
-                .collect(Collectors.toList());
+                .map(ResourcesMojoTest::newResource)
+                .toList();
+    }
+
+    // TODO: temporary method before upgrade to new API.
+    private static Resource newResource(org.apache.maven.api.model.Resource res) {
+        Resource resource = new Resource();
+        resource.setDirectory(res.getDirectory());
+        resource.setFiltering(res.isFiltering());
+        resource.setExcludes(res.getExcludes());
+        resource.setIncludes(res.getIncludes());
+        resource.setMergeId(res.getMergeId());
+        resource.setTargetPath(res.getTargetPath());
+        return resource;
     }
 }

src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java

@@ -21,7 +21,6 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.maven.api.Project;
 import org.apache.maven.api.di.Provides;
@@ -30,7 +29,7 @@
 import org.apache.maven.api.plugin.testing.InjectMojo;
 import org.apache.maven.api.plugin.testing.MojoTest;
 import org.apache.maven.api.plugin.testing.stubs.SessionMock;
-import org.apache.maven.internal.impl.InternalSession;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
 import org.apache.maven.shared.filtering.Resource;
 import org.codehaus.plexus.util.FileUtils;
@@ -107,9 +106,7 @@ private static Project createProject() throws Exception {
         return new MavenProjectResourcesStub();
     }
 
-    private List<Resource> getResources(MavenProjectResourcesStub project) {
-        return project.getBuild().getResources().stream()
-                .map(ResourceUtils::newResource)
-                .collect(Collectors.toList());
+    private static List<Resource> getResources(MavenProjectResourcesStub project) {
+        return ResourcesMojoTest.getResources(project);
     }
 }