From c49e40dd2cbf8f99286f7b8384d239a61c066cd0 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 14 Feb 2025 10:04:34 +0100
Subject: [PATCH 1/2] Upgrade to Maven 4.0.0-rc-2

---
 pom.xml                                       | 20 ++++++-
 .../maven/shared/filtering/StubSession.java   | 58 ++++++++++---------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61fb4eae..9a205202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,12 +62,12 @@
 
   <properties>
     <javaVersion>17</javaVersion>
-    <mavenVersion>4.0.0-rc-1</mavenVersion>
+    <mavenVersion>4.0.0-rc-2</mavenVersion>
 
     <hamcrestVersion>3.0</hamcrestVersion>
     <junitVersion>5.10.1</junitVersion>
-    <mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
     <mockitoVersion>5.15.2</mockitoVersion>
+    <mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion>
     <plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
     <plexusInterpolationVersion>1.27</plexusInterpolationVersion>
     <slf4jVersion>2.0.13</slf4jVersion>
@@ -96,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-api-meta</artifactId>
+      <artifactId>maven-api-annotations</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
     <dependency>
@@ -197,6 +197,20 @@
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <configuration>
+            <rules>
+              <enforceBytecodeVersion>
+                <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                <excludes>
+                  <exclude>org.jline:jline</exclude>
+                </excludes>
+              </enforceBytecodeVersion>
+            </rules>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubSession.java b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
index 1ae17ef9..2b603070 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubSession.java
@@ -37,9 +37,9 @@
  */
 public class StubSession implements Session {
 
-    private final Map<String, String> userProperties;
+    private Map<String, String> userProperties;
 
-    private final Map<String, String> systemProperties;
+    private Map<String, String> systemProperties;
 
     private final Settings settings;
 
@@ -199,12 +199,14 @@ public Artifact createArtifact(
     }
 
     @Override
-    public ProducedArtifact createProducedArtifact(String s, String s1, String s2, String s3) {
+    public ProducedArtifact createProducedArtifact(
+            String groupId, String artifactId, String version, String extension) {
         return null;
     }
 
     @Override
-    public ProducedArtifact createProducedArtifact(String s, String s1, String s2, String s3, String s4, String s5) {
+    public ProducedArtifact createProducedArtifact(
+            String groupId, String artifactId, String version, String classifier, String extension, String type) {
         return null;
     }
 
@@ -245,27 +247,27 @@ public DownloadedArtifact resolveArtifact(Artifact artifact) {
     }
 
     @Override
-    public DownloadedArtifact resolveArtifact(Artifact artifact, List<RemoteRepository> list) {
+    public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
         return null;
     }
 
     @Override
-    public DownloadedArtifact resolveArtifact(ArtifactCoordinates coordinate) {
+    public Collection<DownloadedArtifact> resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
         return null;
     }
 
     @Override
-    public DownloadedArtifact resolveArtifact(ArtifactCoordinates artifactCoordinates, List<RemoteRepository> list) {
+    public Collection<DownloadedArtifact> resolveArtifacts(Collection<? extends ArtifactCoordinates> collection) {
         return null;
     }
 
     @Override
-    public Collection<DownloadedArtifact> resolveArtifacts(ArtifactCoordinates... artifactCoordinates) {
+    public Collection<DownloadedArtifact> resolveArtifacts(Artifact... artifacts) {
         return null;
     }
 
     @Override
-    public Collection<DownloadedArtifact> resolveArtifacts(Collection<? extends ArtifactCoordinates> collection) {
+    public DownloadedArtifact resolveArtifact(ArtifactCoordinates artifactCoordinates, List<RemoteRepository> list) {
         return null;
     }
 
@@ -276,21 +278,15 @@ public Collection<DownloadedArtifact> resolveArtifacts(
     }
 
     @Override
-    public Collection<DownloadedArtifact> resolveArtifacts(Artifact... artifacts) {
+    public DownloadedArtifact resolveArtifact(Artifact artifact, List<RemoteRepository> list) {
         return null;
     }
 
     @Override
-    public void installArtifacts(ProducedArtifact... producedArtifacts) {}
-
-    @Override
-    public void installArtifacts(Collection<ProducedArtifact> collection) {}
-
-    @Override
-    public void deployArtifact(RemoteRepository remoteRepository, ProducedArtifact... producedArtifacts) {}
-
-    @Override
-    public void setArtifactPath(ProducedArtifact producedArtifact, Path path) {}
+    public List<Version> resolveVersionRange(ArtifactCoordinates artifactCoordinates, List<RemoteRepository> list)
+            throws VersionResolverException {
+        return List.of();
+    }
 
     @Override
     public List<Node> flattenDependencies(Node node, PathScope scope) {
@@ -323,10 +319,16 @@ public List<Version> resolveVersionRange(ArtifactCoordinates artifact) {
     }
 
     @Override
-    public List<Version> resolveVersionRange(ArtifactCoordinates artifactCoordinates, List<RemoteRepository> list)
-            throws VersionResolverException {
-        return List.of();
-    }
+    public void installArtifacts(ProducedArtifact... artifacts) {}
+
+    @Override
+    public void installArtifacts(Collection<ProducedArtifact> artifacts) {}
+
+    @Override
+    public void deployArtifact(RemoteRepository repository, ProducedArtifact... artifacts) {}
+
+    @Override
+    public void setArtifactPath(ProducedArtifact artifact, Path path) {}
 
     @Override
     public Optional<Path> getArtifactPath(Artifact artifact) {
@@ -339,17 +341,17 @@ public boolean isVersionSnapshot(String version) {
     }
 
     @Override
-    public Node collectDependencies(Artifact artifact, PathScope pathScope) {
+    public Node collectDependencies(Artifact artifact, PathScope scope) {
         return null;
     }
 
     @Override
-    public Node collectDependencies(Project project, PathScope pathScope) {
+    public Node collectDependencies(Project project, PathScope scope) {
         return null;
     }
 
     @Override
-    public Node collectDependencies(DependencyCoordinates dependencyCoordinates, PathScope pathScope) {
+    public Node collectDependencies(DependencyCoordinates dependencyCoordinate, PathScope scope) {
         return null;
     }
 
@@ -380,7 +382,7 @@ public VersionConstraint parseVersionConstraint(String s) {
 
     @Override
     public Map<PathType, List<Path>> resolveDependencies(
-            DependencyCoordinates dependencyCoordinates, PathScope scope, Collection<PathType> desiredTypes) {
+            DependencyCoordinates dependencyCoordinate, PathScope scope, Collection<PathType> desiredTypes) {
         return Map.of();
     }
 

From d89109130736145e02d10b5f93a9993a6195a832 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 14 Feb 2025 19:13:15 +0100
Subject: [PATCH 2/2] Simplify GH Action

---
 .github/workflows/maven-verify.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index ae2e2115..16a2a518 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,9 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
     with:
-      ff-maven: "4.0.0-rc-1"                     # Maven version for fail-fast-build
-      maven-matrix: '[ "4.0.0-rc-1" ]'
-      maven4-enabled: true
-      jdk-matrix: '[ "17", "21", "23" ]'
+      maven4-build: true
       ff-goal: verify
       verify-goal: verify