svn commit: r1176365 - in /felix/trunk/scrplugin/maven-scr-plugin: changelog.txt src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Sep 27 12:55:03 2011
New Revision: 1176365

URL: http://svn.apache.org/viewvc?rev=1176365&view=rev
Log:
FELIX-3070 :  SCR Plugin and dependencies with classifier cause issue depending on the order of dependency in pom.xml

Modified:
    felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
    felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java

Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1176365&r1=1176364&r2=1176365&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Tue Sep 27 12:55:03 2011
@@ -4,6 +4,8 @@ Changes from 1.7.2 to 1.7.4
 ** Bug
     * [FELIX-2963] - scr annotations @Activate @Deactivate @Modified are not detected with class inheritance
     * [FELIX-3117] - NullPointerException when not implementing interface that is defined with @Service
+    * [FELIX-3070} - SCR Plugin and dependencies with classifier cause issue depending on the order of dependency in pom.xml
+
 
 ** Improvement
     * [FELIX-3066] - Add support for source directory include filter via plugin configuration

Modified: felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java?rev=1176365&r1=1176364&r2=1176365&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java Tue Sep 27 12:55:03 2011
@@ -25,7 +25,6 @@ import java.util.*;
 import org.apache.felix.scrplugin.*;
 import org.apache.felix.scrplugin.helper.StringUtils;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.DirectoryScanner;
 
@@ -120,8 +119,7 @@ public class MavenJavaClassDescriptorMan
         ArrayList<File> dependencies = new ArrayList<File>();
 
         @SuppressWarnings("unchecked")
-        final Map<String, Artifact> resolved = project.getArtifactMap();
-        final Iterator<Artifact> it = resolved.values().iterator();
+        final Iterator<Artifact> it = project.getArtifacts().iterator();
         while ( it.hasNext() )
         {
             final Artifact declared = it.next();
@@ -134,10 +132,9 @@ public class MavenJavaClassDescriptorMan
                     || Artifact.SCOPE_SYSTEM.equals( declared.getScope() ) )
                 {
                     this.log.debug( "Resolving artifact " + declared );
-                    final Artifact artifact = resolved.get( ArtifactUtils.versionlessKey( declared ) );
-                    if ( artifact != null )
+                    if ( declared.getFile() != null )
                     {
-                        dependencies.add( artifact.getFile() );
+                        dependencies.add( declared.getFile() );
                     }
                     else
                     {