svn commit: r755281 - in /archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src: main/java/org/apache/maven/archiva/dependency/graph/tasks/ test/java/org/apache/maven/archiva/dependency/graph/

[brett]

Author: brett
Date: Tue Mar 17 15:32:43 2009
New Revision: 755281

URL: http://svn.apache.org/viewvc?rev=755281&view=rev
Log:
restore previous behaviour, though it appears wrong

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java?rev=755281&r1=755280&r2=755281&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
 Tue Mar 17 15:32:43 2009
@@ -129,10 +129,12 @@
                 return -1;
             }
 
-            String version1 = o1.artifact.getVersion();
-            String version2 = o2.artifact.getVersion();
-
-            return VersionComparator.getInstance().compare( version1, version2 
);
+//            String version1 = o1.artifact.getVersion();
+//            String version2 = o2.artifact.getVersion();
+//
+//            VersionComparator.getInstance().compare( version1, version2 );
+            
+            return 0;
         }
     }
 

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java?rev=755281&r1=755280&r2=755281&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
 Tue Mar 17 15:32:43 2009
@@ -185,15 +185,15 @@
 
         CollectionUtils.transform( actualNodes, new ToKeyTransformer() );
 
-        Collection<DependencyGraphNode> missingActualKeys = 
CollectionUtils.subtract( actualNodes, expectedNodeKeys );
-        for ( DependencyGraphNode key : missingActualKeys )
+        Collection<String> missingActualKeys = CollectionUtils.subtract( 
actualNodes, expectedNodeKeys );
+        for ( String key : missingActualKeys )
         {
             sb.append( "\n (Extra Actual) " ).append( key );
             fail = true;
         }
 
-        Collection<DependencyGraphNode> missingExpectedKeys = 
CollectionUtils.subtract( expectedNodeKeys, actualNodes );
-        for ( DependencyGraphNode key : missingExpectedKeys )
+        Collection<String> missingExpectedKeys = CollectionUtils.subtract( 
expectedNodeKeys, actualNodes );
+        for ( String key : missingExpectedKeys )
         {
             sb.append( "\n (Extra Expected) " ).append( key );
             fail = true;
@@ -237,8 +237,8 @@
 
             CollectionUtils.transform( actualNodes, new ToKeyTransformer() );
 
-            Collection<DependencyGraphNode> missingActualKeys = 
CollectionUtils.subtract( actualNodes, expectedNodeKeys );
-            for ( DependencyGraphNode key : missingActualKeys )
+            Collection<String> missingActualKeys = CollectionUtils.subtract( 
actualNodes, expectedNodeKeys );
+            for ( String key : missingActualKeys )
             {
                 sb.append( "\n (Extra Actual) " ).append( key );
             }