Merge pull request #26086 from famod/mvn-3.8.6

Update Maven to 3.8.6, maven-wrapper to 3.1.1 and maven-invoker to 3.2.0
quarkusio · Jun 14, 2022 · 853d8d7 · 853d8d7
2 parents 5aa3d4e + a342c56
commit 853d8d7
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 242 deletions.
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -5,14 +5,14 @@
 # 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
-# 
+#
+#   https://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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -149,7 +149,7 @@
         <kotlin-serialization.version>1.3.3</kotlin-serialization.version>
         <kubernetes-client.version>5.12.2</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
         <dekorate.version>2.9.2</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
-        <maven-invoker.version>3.1.0</maven-invoker.version>
+        <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.0</awaitility.version>
         <jboss-logmanager.version>1.0.10</jboss-logmanager.version>
         <flyway.version>8.5.11</flyway.version>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -64,8 +64,8 @@
         <supported-maven-versions>[3.6.2,)</supported-maven-versions>
 
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.8.4</proposed-maven-version>
-        <maven-wrapper.version>3.1.0</maven-wrapper.version>
+        <proposed-maven-version>3.8.6</proposed-maven-version>
+        <maven-wrapper.version>3.1.1</maven-wrapper.version>
         <gradle-wrapper.version>7.4.2</gradle-wrapper.version>
         <quarkus-gradle-plugin.version>${project.version}</quarkus-gradle-plugin.version>
         <quarkus-maven-plugin.version>${project.version}</quarkus-maven-plugin.version>

diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
@@ -44,7 +44,7 @@
         <version.jta>1.3.3</version.jta>
         <version.jandex>2.4.2.Final</version.jandex>
         <version.junit5>5.8.2</version.junit5>
-        <version.maven>3.8.4</version.maven>
+        <version.maven>3.8.6</version.maven>
         <version.assertj>3.23.1</version.assertj>
         <version.jboss-logging>3.5.0.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>

diff --git a/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
@@ -29,7 +29,7 @@
 import org.apache.maven.model.building.ModelProblemCollector;
 import org.apache.maven.model.building.ModelProblemCollectorRequest;
 import org.apache.maven.model.path.DefaultPathTranslator;
-import org.apache.maven.model.path.PathTranslator;
+import org.apache.maven.model.path.ProfileActivationFilePathInterpolator;
 import org.apache.maven.model.profile.DefaultProfileActivationContext;
 import org.apache.maven.model.profile.DefaultProfileSelector;
 import org.apache.maven.model.profile.activation.FileProfileActivator;
@@ -968,19 +968,17 @@ private static FileProfileActivator createFileProfileActivator() throws Bootstra
         var activator = new FileProfileActivator();
         var translator = new DefaultPathTranslator();
         try {
-            activator.setPathTranslator(translator);
-        } catch (LinkageError e) {
-            // setPathTranslator() not found; Maven >= 3.8.5 (https://github.com/apache/maven/pull/649)
+            var pathInterpolator = new ProfileActivationFilePathInterpolator();
+            pathInterpolator.setPathTranslator(translator);
+            activator.setProfileActivationFilePathInterpolator(pathInterpolator);
+        } catch (NoClassDefFoundError e) {
+            // ProfileActivationFilePathInterpolator not found; Maven < 3.8.5 (https://github.com/apache/maven/pull/649)
             try {
-                var interpolatorClass = Thread.currentThread().getContextClassLoader()
-                        .loadClass("org.apache.maven.model.path.ProfileActivationFilePathInterpolator");
-                var interpolator = interpolatorClass.getDeclaredConstructor().newInstance();
-                interpolatorClass.getMethod("setPathTranslator", PathTranslator.class)
-                        .invoke(interpolator, translator);
-                activator.getClass().getMethod("setProfileActivationFilePathInterpolator", interpolatorClass)
-                        .invoke(activator, interpolator);
+                activator.getClass().getMethod("setPathTranslator", org.apache.maven.model.path.PathTranslator.class)
+                        .invoke(activator, translator);
             } catch (ReflectiveOperationException reflectionExc) {
-                throw new BootstrapMavenException("Failed to set up Maven 3.8.5+ ProfileActivationFilePathInterpolator",
+                throw new BootstrapMavenException(
+                        "Failed to set up DefaultPathTranslator for Maven < 3.8.5 DefaultPathTranslator",
                         reflectionExc);
             }
         }

diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -43,12 +43,12 @@
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
         <jsoup.version>1.14.2</jsoup.version> <!-- wagon-http dependency -->
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
-        <maven-core.version>3.8.4</maven-core.version><!-- Keep in sync with sisu.version -->
+        <maven-core.version>3.8.6</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.3.5</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
         <maven-resolver.version>1.6.3</maven-resolver.version>
         <maven-shared-utils.version>3.3.4</maven-shared-utils.version> <!-- Keep in sync with maven-core.version (force this version on maven-invoker) -->
-        <maven-wagon.version>3.4.3</maven-wagon.version>
+        <maven-wagon.version>3.5.1</maven-wagon.version>
         <httpcore.version>4.4.15</httpcore.version><!-- Keep in sync with maven-wagon.version (wagon-http 3.4.3 brings in 4.4.13 and 4.4.14) -->
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <jackson-bom.version>2.13.3</jackson-bom.version>

diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml
@@ -37,7 +37,7 @@
 
         <enforcer-api.version>3.0.0-M3</enforcer-api.version>
         <maven-invoker-plugin.version>3.2.2</maven-invoker-plugin.version>
-        <maven-core.version>3.8.4</maven-core.version>
+        <maven-core.version>3.8.6</maven-core.version>
 
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     </properties>

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -43,7 +43,7 @@
         <jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
         <jandex.version>2.4.2.Final</jandex.version>
         <junit5.version>5.8.2</junit5.version>
-        <maven.version>3.8.4</maven.version>
+        <maven.version>3.8.6</maven.version>
         <assertj.version>3.23.1</assertj.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>

diff --git a/...base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/codestart.yml b/...base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
@@ -6,8 +6,8 @@ language:
   base:
     data:
       maven:
-        version: 3.8.4
-        wrapper-version: 3.1.0
+        version: 3.8.6
+        wrapper-version: 3.1.1
     shared-data:
       buildtool:
         cli: ./mvnw
diff --git a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
@@ -368,8 +368,8 @@
         "gradle-plugin-id": "io.quarkus",
         "gradle-plugin-version": "999-FAKE",
         "supported-maven-versions": "[3.6.2,)",
-        "proposed-maven-version": "3.8.4",
-        "maven-wrapper-version": "3.1.0",
+        "proposed-maven-version": "3.8.6",
+        "maven-wrapper-version": "3.1.1",
         "gradle-wrapper-version": "7.4.2"
       }
     },

diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
@@ -36,8 +36,8 @@
         <maven.compiler.release>11</maven.compiler.release>
 
         <!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
-        <proposed-maven-version>3.8.4</proposed-maven-version>
-        <maven-wrapper.version>3.1.0</maven-wrapper.version>
+        <proposed-maven-version>3.8.6</proposed-maven-version>
+        <maven-wrapper.version>3.1.1</maven-wrapper.version>
         <gradle-wrapper.version>7.4.2</gradle-wrapper.version>
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
@@ -54,7 +54,7 @@
         <junit.version>5.8.2</junit.version>
         <commons-compress.version>1.21</commons-compress.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
-        <maven-core.version>3.8.4</maven-core.version>
+        <maven-core.version>3.8.6</maven-core.version>
         <mockito.version>4.6.0</mockito.version>
         <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>