You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/04/06 20:41:31 UTC

svn commit: r526242 - /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java

Author: carlos
Date: Fri Apr  6 11:41:31 2007
New Revision: 526242

URL: http://svn.apache.org/viewvc?view=rev&rev=526242
Log:
[MNG-2931] Add workaround to MNG-2931

Modified:
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java?view=diff&rev=526242&r1=526241&r2=526242
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java Fri Apr  6 11:41:31 2007
@@ -126,6 +126,22 @@
                                     + "': " + exception.getMessage(), exception );
                 }
             }
+
+            /*
+             * TODO work around bug MNG-2931, remove after upgrading to fixed version  
+             * remove the originating artifact if it is also in managed versions to avoid being modified during resolution
+             */
+            Artifact managedOriginatingArtifact = (Artifact) managedVersionMap.get( project.getArtifact()
+                .getDependencyConflictId() );
+            if ( managedOriginatingArtifact != null )
+            {
+                String managedVersion = managedOriginatingArtifact.getVersion();
+                String version = project.getArtifact().getVersion();
+                if ( !managedVersion.equals( version ) )
+                {
+                    managedVersionMap.remove( project.getArtifact().getDependencyConflictId() );
+                }
+            }
         }
         else
         {