From: Brett Porter <brett@apache.org>
Date: Tue, 17 Mar 2009 15:32:43 +0000 (+0000)
Subject: restore previous behaviour, though it appears wrong
X-Git-Tag: archiva-1.2~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=26a9c2edfc949b32adba01d947599f776a138203;p=archiva.git

restore previous behaviour, though it appears wrong


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755281 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
index 158edaa59..acf0a517c 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
@@ -129,10 +129,12 @@ public class RefineConflictsVisitor
                 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;
         }
     }
 
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
index 1413b36ce..908ee3f8d 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java
@@ -185,15 +185,15 @@ public abstract class AbstractDependencyGraphFactoryTestCase
 
         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 @@ public abstract class AbstractDependencyGraphFactoryTestCase
 
             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 );
             }