Bump to maven-parent 40, maven 3.9.3 and 4.0.0-alpha-7 and maven-reso…

…lver 1.9.13 (#858)
apache · Jul 3, 2023 · 838b720 · 838b720
1 parent bf981d6
commit 838b720
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 58 deletions.
diff --git a/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
diff --git a/dist-m40/src/main/provisio/maven-distro.xml b/dist-m40/src/main/provisio/maven-distro.xml
@@ -37,6 +37,9 @@
         <artifact id="org.slf4j:jul-to-slf4j">
             <exclusion id="*:*"/>
         </artifact>
+        <artifact id="org.apache.maven.shared:maven-shared-utils">
+            <exclusion id="*:*"/>
+        </artifact>
     </artifactSet>
 
     <artifactSet to="/mvn/lib/mvnd">

diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java
@@ -81,7 +81,7 @@ private static List<Avc> listJars(Path mavenHome) {
     static class Avc implements Comparable<Avc> {
 
         private static final Pattern JAR_NAME_PATTERN =
-                Pattern.compile("^(.*)(?:-([0-9]+(?:\\.[0-9]+)*))(?:-(.*))?.jar$");
+                Pattern.compile("^(.*)(?:-([0-9]+(?:\\.[0-9]+)*))(?:[-.](.*))?.jar$");
 
         public static Avc of(String jarName) {
             final Matcher m = JAR_NAME_PATTERN.matcher(jarName);

diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java
@@ -48,6 +48,17 @@ void versionsSet() throws IOException, InterruptedException {
                 MvndTestUtil.version(parameters.multiModuleProjectDirectory().resolve("pom.xml"));
         Assertions.assertEquals("0.0.1-SNAPSHOT", version);
 
+        final TestClientOutput output = new TestClientOutput();
+        client.execute(output, "-v").assertSuccess();
+        output.describeTerminal();
+        String mavenVersion = output.getMessages().stream()
+                .filter(m -> m.getType() == Message.BUILD_LOG_MESSAGE)
+                .map(m -> ((Message.StringMessage) m).getMessage())
+                .filter(s -> s.matches("[\\s\\S]*Apache Maven ([0-9][^ ]*) [\\s\\S]*"))
+                .map(s -> s.replaceAll("[\\s\\S]*Apache Maven ([0-9][^ ]*) [\\s\\S]*", "$1"))
+                .findFirst()
+                .get();
+
         final TestClientOutput o = new TestClientOutput() {
             @Override
             public void accept(Message m) {
@@ -57,7 +68,11 @@ public void accept(Message m) {
                 super.accept(m);
             }
         };
-        client.execute(o, "versions:set").assertSuccess();
+        if (mavenVersion.startsWith("4")) {
+            client.execute(o, "--force-interactive", "versions:set").assertSuccess();
+        } else {
+            client.execute(o, "versions:set").assertSuccess();
+        }
 
         final String newVersion =
                 MvndTestUtil.version(parameters.multiModuleProjectDirectory().resolve("pom.xml"));

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -35,6 +35,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-embedder</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+    </dependency>
 
     <!-- Logging -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>39</version>
+    <version>40</version>
     <relativePath />
   </parent>
 
@@ -88,11 +88,11 @@
     <jline.version>3.23.0</jline.version>
     <junit.jupiter.version>5.9.2</junit.jupiter.version>
     <logback.version>1.2.11</logback.version>
-    <maven.version>4.0.0-alpha-5</maven.version>
-    <maven3.version>3.9.1</maven3.version>
+    <maven.version>4.0.0-alpha-7</maven.version>
+    <maven3.version>3.9.3</maven3.version>
     <maven4.version>${maven.version}</maven4.version>
     <!-- Keep in sync with Maven -->
-    <maven.resolver.version>1.9.7</maven.resolver.version>
+    <maven.resolver.version>1.9.13</maven.resolver.version>
     <slf4j.version>1.7.36</slf4j.version>
     <sisu.version>0.9.0.M1</sisu.version>
 
@@ -230,6 +230,12 @@
         <version>${maven.resolver.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-shared-utils</artifactId>
+        <version>3.4.2</version>
+      </dependency>
+
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>