This is an automated email from the ASF dual-hosted git repository.
slawekjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
The following commit(s) were added to refs/heads/master by this push:
new 12d46630 Fix #1074: requireSameVersions no longer drops members
sharing a version
12d46630 is described below
commit 12d46630deb9f47b40b847b209294370b0376373
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Nov 5 07:45:47 2026 +0100
Fix #1074: requireSameVersions no longer drops members sharing a version
RequireSameVersions.execute merged the per-source (dependency, build
plugin, report plugin) results with Map.putAll, so a version shared by
two sources had the earlier source's members silently replaced by the
later one's in the failure message. Detection was unaffected, only the
message was incomplete.
collectVersionMembers now writes directly into the shared map instead
of returning a separate map to be merged with putAll.
---
.../maven/enforcer/rules/RequireSameVersions.java | 26 +++++++++++--------
.../enforcer/rules/TestRequireSameVersions.java | 29 ++++++++++++++++++++++
2 files changed, 44 insertions(+), 11 deletions(-)
diff --git
a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java
b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java
index 8acaa204..5ff9662d 100644
---
a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java
+++
b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireSameVersions.java
@@ -78,20 +78,26 @@ public final class RequireSameVersions extends
AbstractStandardEnforcerRule {
Set<String> allReportPlugins = new HashSet<>(reportPlugins);
allReportPlugins.addAll(plugins);
// CHECKSTYLE_OFF: LineLength
- versionMembers.putAll(collectVersionMembers(
+ collectVersionMembers(
+ versionMembers,
project.getArtifacts(),
dependencies,
" (dependency)",
- artifact -> uniqueVersions ? artifact.getVersion() :
artifact.getBaseVersion()));
+ artifact -> uniqueVersions ? artifact.getVersion() :
artifact.getBaseVersion());
- versionMembers.putAll(collectVersionMembers(
+ collectVersionMembers(
+ versionMembers,
project.getPluginArtifacts(),
allBuildPlugins,
" (buildPlugin)",
- artifact -> uniqueVersions ? artifact.getVersion() :
artifact.getBaseVersion()));
-
- versionMembers.putAll(collectVersionMembers(
- project.getReportArtifacts(), allReportPlugins, "
(reportPlugin)", this::getReportPluginVersion));
+ artifact -> uniqueVersions ? artifact.getVersion() :
artifact.getBaseVersion());
+
+ collectVersionMembers(
+ versionMembers,
+ project.getReportArtifacts(),
+ allReportPlugins,
+ " (reportPlugin)",
+ this::getReportPluginVersion);
// CHECKSTYLE_ON: LineLength
if (versionMembers.size() > 1) {
@@ -123,13 +129,12 @@ public final class RequireSameVersions extends
AbstractStandardEnforcerRule {
}
}
- private Map<String, List<String>> collectVersionMembers(
+ private void collectVersionMembers(
+ Map<String, List<String>> versionMembers,
Set<Artifact> artifacts,
Collection<String> patterns,
String source,
Function<Artifact, String> versionResolver) {
- Map<String, List<String>> versionMembers = new LinkedHashMap<>();
-
List<Pattern> regExs = new ArrayList<>();
for (String pattern : patterns) {
String regex = pattern.replace(".", "\\.")
@@ -151,7 +156,6 @@ public final class RequireSameVersions extends
AbstractStandardEnforcerRule {
}
}
}
- return versionMembers;
}
private String getReportPluginVersion(Artifact artifact) {
diff --git
a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java
b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java
index 5a05a37f..dac775ac 100644
---
a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java
+++
b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java
@@ -428,6 +428,35 @@ class TestRequireSameVersions {
.hasMessageContaining("- org.acme:acme-surefire-report:jar
(reportPlugin)");
}
+ @Test
+ void shouldListMembersFromAllSourcesSharingAConflictingVersion() throws
IOException {
+ String conflictVersion = "1.0";
+ Artifact dependencyAtConflictVersion =
constructArtifact("acme-dependency", conflictVersion);
+ Artifact buildPluginAtConflictVersion =
constructArtifact("acme-build-plugin", conflictVersion);
+ Artifact dependencyAtOtherVersion =
constructArtifact("acme-other-dependency", "2.0");
+
+ rule.addDependency(extractGaString(dependencyAtConflictVersion));
+ rule.addDependency(extractGaString(dependencyAtOtherVersion));
+ rule.addBuildPlugin(extractGaString(buildPluginAtConflictVersion));
+
+ HashSet<Artifact> dependencies = new HashSet<>();
+ dependencies.add(dependencyAtConflictVersion);
+ dependencies.add(dependencyAtOtherVersion);
+ HashSet<Artifact> pluginArtifacts = new HashSet<>();
+ pluginArtifacts.add(buildPluginAtConflictVersion);
+
+ when(project.getArtifacts()).thenReturn(dependencies);
+ when(project.getPluginArtifacts()).thenReturn(pluginArtifacts);
+ when(project.getReportArtifacts()).thenReturn(new HashSet<>());
+
+ // Both members at the shared version must be named, not just the one
from
+ // whichever source (dependency, build plugin, report plugin) was
merged last.
+ assertThatThrownBy(rule::execute)
+ .isInstanceOf(EnforcerRuleException.class)
+ .hasMessageContaining("org.acme:acme-dependency")
+ .hasMessageContaining("org.acme:acme-build-plugin");
+ }
+
private static Artifact constructArtifact(String artifactId, String
version) throws IOException {
return ARTIFACT_FACTORY.createArtifact("org.acme", artifactId,
version);
}