Update Maven to 3.5.0 (#351)

mojohaus · Mar 31, 2023 · a74d05b · a74d05b
1 parent 46e2e65
commit a74d05b
Show file tree

Hide file tree

Showing 29 changed files with 25 additions and 55 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,4 +25,4 @@ jobs:
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
     with:
       ff-maven: "3.9.1"                     # Maven version for fail-fast-build
-      maven-matrix: '[ "3.2.5", "3.8.8", "3.9.1" ]'  # Maven versions matrix for verify builds
+      maven-matrix: '[ "3.5.4", "3.8.8", "3.9.1" ]' # Maven versions matrix for verify builds
diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,7 @@
   </scm>
 
   <properties>
-    <mavenVersion>3.2.5</mavenVersion>
+    <mavenVersion>3.5.0</mavenVersion>
     <recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
     <project.build.outputTimestamp>2023-03-27T21:27:03Z</project.build.outputTimestamp>
   </properties>

diff --git a/src/it/projects/bom-flattenMode/pom.xml b/src/it/projects/bom-flattenMode/pom.xml
@@ -105,8 +105,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/bom-pomElements/pom.xml b/src/it/projects/bom-pomElements/pom.xml
@@ -107,8 +107,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-artifact-pom/pom.xml b/src/it/projects/complete-artifact-pom/pom.xml
@@ -91,8 +91,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-artifact-pom/verify.groovy b/src/it/projects/complete-artifact-pom/verify.groovy
@@ -44,7 +44,6 @@ assert 1 == originalProject.pluginRepositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/complete-mavenplugin-pom/pom.xml b/src/it/projects/complete-mavenplugin-pom/pom.xml
@@ -91,8 +91,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-mavenplugin-pom/verify.groovy b/src/it/projects/complete-mavenplugin-pom/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.parent.size()
 assert 1 == originalProject.pluginRepositories.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml b/src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml
@@ -107,8 +107,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-multimodule-parent-pom-cifriendly/verify.groovy b/src/it/projects/complete-multimodule-parent-pom-cifriendly/verify.groovy
@@ -46,7 +46,6 @@ assert 1 == originalProject.pluginRepositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/complete-multimodule-parent-pom-direct-dependencies/pom.xml b/src/it/projects/complete-multimodule-parent-pom-direct-dependencies/pom.xml
@@ -109,8 +109,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports />
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-multimodule-parent-pom-direct-dependencies/verify.groovy b/src/it/projects/complete-multimodule-parent-pom-direct-dependencies/verify.groovy
@@ -46,7 +46,6 @@ assert 1 == originalProject.pluginRepositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/complete-multimodule-parent-pom/pom.xml b/src/it/projects/complete-multimodule-parent-pom/pom.xml
@@ -93,8 +93,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/complete-multimodule-parent-pom/verify.groovy b/src/it/projects/complete-multimodule-parent-pom/verify.groovy
@@ -46,7 +46,6 @@ assert 1 == originalProject.pluginRepositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/external-parent/pom.xml b/src/it/projects/external-parent/pom.xml
@@ -111,8 +111,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/external-parent/verify.groovy b/src/it/projects/external-parent/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.repositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/issue-348-repository-from-project/pom.xml b/src/it/projects/issue-348-repository-from-project/pom.xml
@@ -22,7 +22,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-RC2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/it/projects/issue-348-repository-from-project/verify.groovy b/src/it/projects/issue-348-repository-from-project/verify.groovy
@@ -9,4 +9,4 @@ assert 1 ==  flattendProject.repositories.size()
 
 assert 1 ==  flattendProject.dependencies.size()
 assert 'spring-core' ==  flattendProject.dependencies.dependency.artifactId.text()
-assert '6.0.0-M6' ==  flattendProject.dependencies.dependency.version.text()
+assert '6.0.0-RC4' ==  flattendProject.dependencies.dependency.version.text()
diff --git a/src/it/projects/jdk-profile-inactive/pom.xml b/src/it/projects/jdk-profile-inactive/pom.xml
@@ -56,7 +56,6 @@
       <reporting>
         <outputDirectory>target/site</outputDirectory>
       </reporting>
-      <reports/>
     </profile>
   </profiles>
 </project>
diff --git a/src/it/projects/jdk-profile-inactive/verify.groovy b/src/it/projects/jdk-profile-inactive/verify.groovy
@@ -36,7 +36,6 @@ assert 1 == originalProject.profiles.profile.modules.size()
 assert 1 == originalProject.profiles.profile.pluginRepositories.size()
 assert 1 == originalProject.profiles.profile.properties.size()
 assert 1 == originalProject.profiles.profile.reporting.size()
-assert 1 == originalProject.profiles.profile.reports.size()
 
 File flattendPom = new File( basedir, '.flattened-pom.xml' )
 assert flattendPom.exists()

diff --git a/src/it/projects/optional-elements-modeMinimum/pom.xml b/src/it/projects/optional-elements-modeMinimum/pom.xml
@@ -107,8 +107,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/optional-elements-modeMinimum/verify.groovy b/src/it/projects/optional-elements-modeMinimum/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.repositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/optional-elements-modeOss/pom.xml b/src/it/projects/optional-elements-modeOss/pom.xml
@@ -107,8 +107,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/optional-elements-modeOss/verify.groovy b/src/it/projects/optional-elements-modeOss/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.repositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/optional-elements-modeOssrh/pom.xml b/src/it/projects/optional-elements-modeOssrh/pom.xml
@@ -107,8 +107,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/optional-elements-modeOssrh/verify.groovy b/src/it/projects/optional-elements-modeOssrh/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.repositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/it/projects/optional-elements-pomElements-legacy/pom.xml b/src/it/projects/optional-elements-pomElements-legacy/pom.xml
@@ -122,8 +122,6 @@
     <outputDirectory>target/site</outputDirectory>
   </reporting>
 
-  <reports/>
-
   <scm>
     <url>http://svn.codehaus.org/mojo</url>
   </scm>

diff --git a/src/it/projects/optional-elements-pomElements-legacy/verify.groovy b/src/it/projects/optional-elements-pomElements-legacy/verify.groovy
@@ -45,7 +45,6 @@ assert 1 == originalProject.repositories.size()
 assert 1 == originalProject.prerequisites.size()
 assert 1 == originalProject.properties.size()
 assert 1 == originalProject.reporting.size()
-assert 1 == originalProject.reports.size()
 assert 1 == originalProject.scm.size()
 assert 1 == originalProject.url.size()
 

diff --git a/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java b/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.util.List;
 
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
@@ -135,8 +136,19 @@ public ModelResolver newCopy() {
      * @since Apache-Maven-3.2.2 (MNG-5639)
      */
     public ModelSource resolveModel(Parent parent) throws UnresolvableModelException {
-        Artifact artifact =
-                new DefaultArtifact(parent.getGroupId(), parent.getArtifactId(), "", "pom", parent.getVersion());
+        parent.setVersion(resolveVersion(parent.getGroupId(), parent.getArtifactId(), parent.getVersion()));
+        return resolveModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
+    }
+
+    @Override
+    public ModelSource resolveModel(Dependency dependency) throws UnresolvableModelException {
+        dependency.setVersion(
+                resolveVersion(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion()));
+        return resolveModel(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
+    }
+
+    private String resolveVersion(String groupId, String artifactId, String version) throws UnresolvableModelException {
+        Artifact artifact = new DefaultArtifact(groupId, artifactId, "", "pom", version);
 
         VersionRangeRequest versionRangeRequest = new VersionRangeRequest(artifact, repositories, context);
         versionRangeRequest.setTrace(trace);
@@ -146,29 +158,23 @@ public ModelSource resolveModel(Parent parent) throws UnresolvableModelException
 
             if (versionRangeResult.getHighestVersion() == null) {
                 throw new UnresolvableModelException(
-                        "No versions matched the requested range '" + parent.getVersion() + "'",
-                        parent.getGroupId(),
-                        parent.getArtifactId(),
-                        parent.getVersion());
+                        "No versions matched the requested range '" + version + "'", groupId, artifactId, version);
             }
 
             if (versionRangeResult.getVersionConstraint() != null
                     && versionRangeResult.getVersionConstraint().getRange() != null
                     && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null) {
                 throw new UnresolvableModelException(
-                        "The requested version range '" + parent.getVersion() + "' does not specify an upper bound",
-                        parent.getGroupId(),
-                        parent.getArtifactId(),
-                        parent.getVersion());
+                        "The requested version range '" + version + "' does not specify an upper bound",
+                        groupId,
+                        artifactId,
+                        version);
             }
 
-            parent.setVersion(versionRangeResult.getHighestVersion().toString());
+            return versionRangeResult.getHighestVersion().toString();
         } catch (VersionRangeResolutionException e) {
-            throw new UnresolvableModelException(
-                    e.getMessage(), parent.getGroupId(), parent.getArtifactId(), parent.getVersion(), e);
+            throw new UnresolvableModelException(e.getMessage(), groupId, artifactId, version, e);
         }
-
-        return resolveModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
     }
 
     /**