svn commit: r1672659 - in /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart: DependencyLifecycleParticipant.java ModelUtils.java

[cz...@apache.org]

Author: cziegeler
Date: Fri Apr 10 13:30:37 2015
New Revision: 1672659

URL: http://svn.apache.org/r1672659
Log:
Check main artifact and attached artifacts for artifacts from the same build

Modified:
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1672659&r1=1672658&r2=1672659&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java Fri Apr 10 13:30:37 2015
@@ -107,7 +107,8 @@ public class DependencyLifecycleParticip
                 // if it's a project from the current reactor build, we can't resolve it right now
                 final String key = d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion();
                 if ( projectMap.containsKey(key) ) {
-                    allDependencies.add(key + ":" + d.getClassifier() + ":" + d.getType());
+                    allDependencies.add(key + ":" + (d.getClassifier() != null ? d.getClassifier() : "")
+                                            + ":" + (d.getType() != null ? d.getType() : ""));
                 } else {
                     // "external" dependency, we can already resolve it
                     final File modelFile = getSlingstartArtifact(artifactHandlerManager, resolver, project, session, d);

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java?rev=1672659&r1=1672658&r2=1672659&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java Fri Apr 10 13:30:37 2015
@@ -278,6 +278,7 @@ public abstract class ModelUtils {
         for(final Object o : localDeps) {
             if ( o instanceof String ) {
                 final String[] info = ((String)o).split(":");
+
                 final Dependency dep = new Dependency();
                 dep.setGroupId(info[0]);
                 dep.setArtifactId(info[1]);
@@ -343,6 +344,13 @@ public abstract class ModelUtils {
             if ( p.getGroupId().equals(dep.getGroupId())
                  && p.getArtifactId().equals(dep.getArtifactId()) ) {
 
+                // check main artifact first
+                if ( dep.getClassifier() == null && p.getPackaging().equals(dep.getType()) ) {
+                    if ( p.getArtifact() != null && p.getArtifact().getFile() != null ) {
+                        return p.getArtifact().getFile();
+                    }
+                }
+                // followed by attached artifacts
                 for(final Artifact a : p.getAttachedArtifacts()) {
                     if ( equals(a.getType(), dep.getType() ) && equals(a.getClassifier(), dep.getClassifier())) {
                         if ( a.getFile() != null ) {