You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/11/16 17:04:01 UTC

svn commit: r1202780 - /incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java

Author: lcorneliussen
Date: Wed Nov 16 17:04:01 2011
New Revision: 1202780

URL: http://svn.apache.org/viewvc?rev=1202780&view=rev
Log:
[NPANDAY-473] fixed: NoSuchMethodError: Maven 3 does not contain method ArtifactUtils.artifactMapByArtifactId
artifactMapByVersionlessId works in both Maven 2 and Maven 3

Modified:
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java?rev=1202780&r1=1202779&r2=1202780&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java Wed Nov 16 17:04:01 2011
@@ -183,9 +183,9 @@ public class AssemblyResolverImpl
                 else
                 {
                     Map artifactMapByArtifactId = new HashMap();
-                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByArtifactId( Collections.singleton( mavenProjectRef.getArtifact() ) ) );
-                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByArtifactId( mavenProjectRef.getArtifacts() ) );
-                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByArtifactId( mavenProjectRef.getAttachedArtifacts() ) );
+                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByVersionlessId( Collections.singleton( mavenProjectRef.getArtifact() ) ) );
+                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByVersionlessId( mavenProjectRef.getArtifacts() ) );
+                    artifactMapByArtifactId.putAll( ArtifactUtils.artifactMapByVersionlessId( mavenProjectRef.getAttachedArtifacts() ) );
 
                     Artifact projectArtifact = (Artifact) artifactMapByArtifactId.get( artifact.getId() );
                     if ( projectArtifact != null )