Author: brianf
Date: Tue Nov 2 21:16:24 2010
New Revision: 1030225
URL: http://svn.apache.org/viewvc?rev=1030225&view=rev
Log:
MENFORCER-109 applied patch to fix output from Rex Hoffman
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1030225&r1=1030224&r2=1030225&view=diff
==============================================================================
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Tue Nov 2 21:16:24 2010
@@ -109,14 +109,14 @@ public class DependencyConvergence imple
}
private String getFullArtifactName(Artifact artifact){
- return artifact.getGroupId() + ":" + artifact.getArtifactId() +
artifact.getVersion();
+ return artifact.getGroupId() + ":" + artifact.getArtifactId() +":"+
artifact.getVersion();
}
private StringBuilder buildTreeString(DependencyNode node) {
List<String> loc = new ArrayList<String>();
DependencyNode currentNode = node;
while (currentNode != null) {
- loc.add(getFullArtifactName(node.getArtifact()));
+ loc.add(getFullArtifactName(currentNode.getArtifact()));
currentNode = currentNode.getParent();
}
Collections.reverse(loc);
@@ -145,7 +145,7 @@ public class DependencyConvergence imple
if (nodeList.size() > 0){
builder.append(buildTreeString(nodeList.get(0)));
}
- for (DependencyNode node: nodeList){
+ for (DependencyNode node: nodeList.subList(1,nodeList.size())){
builder.append("and\n");
builder.append(buildTreeString(node));
}
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm?rev=1030225&r1=1030224&r2=1030225&view=diff
==============================================================================
---
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Tue Nov 2 21:16:24 2010
@@ -22,7 +22,7 @@
2008-09-13
-----
- This rule requires that dependency version numbers converge. If it has two
dependencies, A and B, both depending on the same artifact, c, this rule will
fail the build if A depends on a different version of C then the version of C
depended on by B.
+ This rule requires that dependency version numbers converge. If a project
has two dependencies, A and B, both depending on the same artifact, C, this
rule will fail the build if A depends on a different version of C then the
version of C depended on by B.
Here is a concrete example.
@@ -49,13 +49,16 @@
-----------------------------------------------------------------------------------
Dependency convergence error for org.slf4j:slf4j-api1.6.1 paths to dependency
are:
-+-org.slf4j:slf4j-api1.6.1
- +-org.slf4j:slf4j-api1.6.1
- +-org.slf4j:slf4j-api1.6.1
+[ERROR]
+Dependency convergence error for org.slf4j:slf4j-api:1.6.1 paths to dependency
are:
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-jdk14:1.6.1
+ +-org.slf4j:slf4j-api:1.6.1
and
-+-org.slf4j:slf4j-api1.6.0
- +-org.slf4j:slf4j-api1.6.0
- +-org.slf4j:slf4j-api1.6.0
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-nop:1.6.0
+ +-org.slf4j:slf4j-api:1.6.0
+
-----------------------------------------------------------------------------------
