Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Maven to 3.5.0 - fix for Maven 4 #351

Merged
merged 7 commits into from Mar 31, 2023
Merged

Update Maven to 3.5.0 - fix for Maven 4 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35a75d9
Update maven to 3.5.0
gnodet Mar 30, 2023
32f7b9f
Implement missing ModelResolver method
gnodet Mar 30, 2023
fce99d1
Remove unsupported <reports/> tags
gnodet Mar 30, 2023
19d8f0c
Better fix to avoid duplicated code
gnodet Mar 30, 2023
394db19
Fix IT
gnodet Mar 30, 2023
1106891
Upgrade the minimum maven version used to 3.5.x
gnodet Mar 30, 2023
c436676
Schedule a new CI build
gnodet Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/bom-flattenMode/pom.xml
View file
Open in desktop
Expand Up @@ -105,8 +105,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/bom-pomElements/pom.xml
View file
Open in desktop
Expand Up @@ -107,8 +107,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/complete-artifact-pom/pom.xml
View file
Open in desktop
Expand Up @@ -91,8 +91,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/complete-artifact-pom/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/complete-mavenplugin-pom/pom.xml
View file
Open in desktop
Expand Up @@ -91,8 +91,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/complete-mavenplugin-pom/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/complete-multimodule-parent-pom-cifriendly/pom.xml
View file
Open in desktop
Expand Up @@ -107,8 +107,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/complete-multimodule-parent-pom-cifriendly/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/complete-multimodule-parent-pom-direct-dependencies/pom.xml
View file
Open in desktop
Expand Up @@ -109,8 +109,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports />

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/complete-multimodule-parent-pom-direct-dependencies/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/complete-multimodule-parent-pom/pom.xml
View file
Open in desktop
Expand Up @@ -93,8 +93,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/complete-multimodule-parent-pom/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/external-parent/pom.xml
View file
Open in desktop
Expand Up @@ -111,8 +111,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/external-parent/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/issue-348-repository-from-project/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/issue-348-repository-from-project/verify.groovy
View file
Open in desktop
Expand Up @@ -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()
1 change: 0 additions & 1 deletion src/it/projects/jdk-profile-inactive/pom.xml
View file
Open in desktop
Expand Up @@ -56,7 +56,6 @@
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
<reports/>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion src/it/projects/jdk-profile-inactive/verify.groovy
View file
Open in desktop
Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/optional-elements-modeMinimum/pom.xml
View file
Open in desktop
Expand Up @@ -107,8 +107,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/optional-elements-modeMinimum/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/optional-elements-modeOss/pom.xml
View file
Open in desktop
Expand Up @@ -107,8 +107,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/optional-elements-modeOss/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/optional-elements-modeOssrh/pom.xml
View file
Open in desktop
Expand Up @@ -107,8 +107,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/optional-elements-modeOssrh/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions src/it/projects/optional-elements-pomElements-legacy/pom.xml
View file
Open in desktop
Expand Up @@ -122,8 +122,6 @@
<outputDirectory>target/site</outputDirectory>
</reporting>

<reports/>

<scm>
<url>http://svn.codehaus.org/mojo</url>
</scm>
Expand Down
1 change: 0 additions & 1 deletion src/it/projects/optional-elements-pomElements-legacy/verify.groovy
View file
Open in desktop
Expand Up @@ -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()

Expand Down
36 changes: 21 additions & 15 deletions src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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());
}

/**
Expand Down