Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restore previous behaviour, though it appears wrong 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755281 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-03-17 15:32:43 +00:00
parent c5d079a9a4
commit 26a9c2edfc
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
View File

@ -129,10 +129,12 @@ public class RefineConflictsVisitor
return -1; return -1;
} }
String version1 = o1.artifact.getVersion(); // String version1 = o1.artifact.getVersion();
String version2 = o2.artifact.getVersion(); // String version2 = o2.artifact.getVersion();
//
// VersionComparator.getInstance().compare( version1, version2 );
return VersionComparator.getInstance().compare( version1, version2 ); return 0;
} }
} }

12
archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
View File

@ -185,15 +185,15 @@ public abstract class AbstractDependencyGraphFactoryTestCase
CollectionUtils.transform( actualNodes, new ToKeyTransformer() ); CollectionUtils.transform( actualNodes, new ToKeyTransformer() );
Collection<DependencyGraphNode> missingActualKeys = CollectionUtils.subtract( actualNodes, expectedNodeKeys ); Collection<String> missingActualKeys = CollectionUtils.subtract( actualNodes, expectedNodeKeys );
for ( DependencyGraphNode key : missingActualKeys ) for ( String key : missingActualKeys )
{ {
sb.append( "\n (Extra Actual) " ).append( key ); sb.append( "\n (Extra Actual) " ).append( key );
fail = true; fail = true;
} }
Collection<DependencyGraphNode> missingExpectedKeys = CollectionUtils.subtract( expectedNodeKeys, actualNodes ); Collection<String> missingExpectedKeys = CollectionUtils.subtract( expectedNodeKeys, actualNodes );
for ( DependencyGraphNode key : missingExpectedKeys ) for ( String key : missingExpectedKeys )
{ {
sb.append( "\n (Extra Expected) " ).append( key ); sb.append( "\n (Extra Expected) " ).append( key );
fail = true; fail = true;
@ -237,8 +237,8 @@ public abstract class AbstractDependencyGraphFactoryTestCase
CollectionUtils.transform( actualNodes, new ToKeyTransformer() ); CollectionUtils.transform( actualNodes, new ToKeyTransformer() );
Collection<DependencyGraphNode> missingActualKeys = CollectionUtils.subtract( actualNodes, expectedNodeKeys ); Collection<String> missingActualKeys = CollectionUtils.subtract( actualNodes, expectedNodeKeys );
for ( DependencyGraphNode key : missingActualKeys ) for ( String key : missingActualKeys )
{ {
sb.append( "\n (Extra Actual) " ).append( key ); sb.append( "\n (Extra Actual) " ).append( key );
} }