This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch buildinfo-range in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
commit 84ef635da26e22e62e31d8bd7227634d6dfa031c Author: Hervé Boutemy <[email protected]> AuthorDate: Mon Nov 9 22:31:01 2026 +0000 Improve message when dependency resolved from range --- src/it/buildinfo-mono/verify.groovy | 2 +- src/it/compare-mono/verify.groovy | 2 +- .../artifact/buildinfo/AbstractBuildinfoMojo.java | 25 +++++++------------- .../artifact/buildinfo/BuildInfoWriter.java | 27 +++++++++++++++++++--- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/it/buildinfo-mono/verify.groovy b/src/it/buildinfo-mono/verify.groovy index a2660b1..f2f503c 100644 --- a/src/it/buildinfo-mono/verify.groovy +++ b/src/it/buildinfo-mono/verify.groovy @@ -37,4 +37,4 @@ if (mavenVersion.startsWith('4.')) { } assert buildinfo.contains( "mvn.minimum.version=3.0.5" ) -assert buildinfo.contains( "mvn.rebuild-args=-Dmaven.session.versionFilter=e(org.slf4j:slf4j-api:(1.7.36,))" ) \ No newline at end of file +assert buildinfo.contains( "# - Dependency org.slf4j:slf4j-api:jar:1.7.36 (compile) has been resolved from a version range (1.7.30,1.7.36]" ) \ No newline at end of file diff --git a/src/it/compare-mono/verify.groovy b/src/it/compare-mono/verify.groovy index bbf1361..d08a730 100644 --- a/src/it/compare-mono/verify.groovy +++ b/src/it/compare-mono/verify.groovy @@ -53,7 +53,7 @@ assert buildinfoFile.isFile() // check generated buildinfo content String buildinfo = buildinfoFile.text -assert buildinfo.contains( "mvn.rebuild-args=-Dmaven.session.versionFilter=e(org.slf4j:slf4j-api:(1.7.36,))" ) +assert buildinfo.contains( "# - Dependency org.slf4j:slf4j-api:jar:1.7.36 (compile) has been resolved from a version range (1.7.30,1.7.36]" ) // check existence of build log File buildLogFile = new File( basedir, "build.log" ); diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java index a34f0a9..84aca94 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java @@ -35,11 +35,9 @@ import java.nio.file.StandardCopyOption; import java.time.Instant; import java.time.format.DateTimeFormatter; import java.util.Collections; -import java.util.LinkedHashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.Set; import java.util.stream.Collectors; import org.apache.maven.archiver.MavenArchiver; @@ -53,7 +51,6 @@ import org.apache.maven.rtinfo.RuntimeInformation; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.graph.DependencyNode; /** @@ -364,12 +361,12 @@ public abstract class AbstractBuildinfoMojo extends AbstractMojo { buildinfoFile.getParentFile().mkdirs(); List<MavenProject> mavenProjects = getProjectListForBuildInfo(mono); - String rangeFilter = getVersionRangeDependenciesFilters(mavenProjects); + Map<DependencyNode, String> versionRangeDependencies = getVersionRangeDependencies(mavenProjects); try (PrintWriter p = new PrintWriter(new BufferedWriter( new OutputStreamWriter(Files.newOutputStream(buildinfoFile.toPath()), StandardCharsets.UTF_8)))) { BuildInfoWriter bi = newBuildInfoWriter(p, mono); - bi.printHeader(root, mono ? null : project, rangeFilter, reproducible); + bi.printHeader(root, mono ? null : project, versionRangeDependencies, reproducible); // artifact(s) fingerprints for (MavenProject project : mavenProjects) { @@ -394,21 +391,15 @@ public abstract class AbstractBuildinfoMojo extends AbstractMojo { } } - private String getVersionRangeDependenciesFilters(List<MavenProject> mavenProjects) throws MojoExecutionException { + private Map<DependencyNode, String> getVersionRangeDependencies(List<MavenProject> mavenProjects) + throws MojoExecutionException { - Set<DependencyNode> dependencyNodeSet = new LinkedHashSet<>(); + Map<DependencyNode, String> dependencyNodeMap = new LinkedHashMap<>(); for (MavenProject project : mavenProjects) { - dependencyNodeSet.addAll( - rangesUtil.findVersionRangeDependencies(session, project).keySet()); + dependencyNodeMap.putAll(rangesUtil.findVersionRangeDependencies(session, project)); } - return dependencyNodeSet.stream() - .map(DependencyNode::getDependency) - .filter(Objects::nonNull) - .map(Dependency::getArtifact) - .filter(Objects::nonNull) - .map(a -> String.format("e(%s:%s:(%s,))", a.getGroupId(), a.getArtifactId(), a.getVersion())) - .collect(Collectors.joining(";")); + return dependencyNodeMap; } protected MavenProject getLastProject() { diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java index 11e5989..7fc1015 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java @@ -32,6 +32,7 @@ import java.nio.file.StandardCopyOption; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.stream.Collectors; @@ -44,6 +45,8 @@ import org.apache.maven.rtinfo.RuntimeInformation; import org.apache.maven.toolchain.Toolchain; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.util.artifact.ArtifactIdUtils; /** @@ -67,7 +70,11 @@ class BuildInfoWriter { this.rtInformation = rtInformation; } - void printHeader(MavenProject project, MavenProject aggregate, String rangeFilter, boolean reproducible) { + void printHeader( + MavenProject project, + MavenProject aggregate, + Map<DependencyNode, String> versionRangeDependencies, + boolean reproducible) { p.println("# https://reproducible-builds.org/docs/jvm/"); p.println("buildinfo.version=1.0-SNAPSHOT"); p.println(); @@ -107,8 +114,22 @@ class BuildInfoWriter { p.println("mvn.minimum.version=" + project.getPrerequisites().getMaven()); } - if (!rangeFilter.isEmpty()) { - p.println("mvn.rebuild-args=-Dmaven.session.versionFilter=" + rangeFilter); + if (!versionRangeDependencies.isEmpty()) { + p.println(); + p.println("# Some dependencies were resolved from version ranges, result may vary over time:"); + versionRangeDependencies.values().forEach(s -> { + p.println("# - " + s); + log.warn(s); + }); + p.println("# With Maven 3.10+, you can force the exact resolved version:"); + String filter = versionRangeDependencies.keySet().stream() + .map(DependencyNode::getDependency) + .filter(Objects::nonNull) + .map(Dependency::getArtifact) + .filter(Objects::nonNull) + .map(a -> String.format("i([%s])@%s:%s", a.getVersion(), a.getGroupId(), a.getArtifactId())) + .collect(Collectors.joining(";")); + p.println("# -Dmaven.session.versionFilter=" + filter); } if (toolchain != null) {
