This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag slingstart-maven-plugin-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 93c268f8a8b47e227422c38e66ffe79e657daa79 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri Apr 10 13:30:37 2015 +0000 Check main artifact and attached artifacts for artifacts from the same build git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1672659 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/maven/slingstart/DependencyLifecycleParticipant.java | 3 ++- src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java index 05ba821..c65f427 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java +++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java @@ -107,7 +107,8 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic // 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); diff --git a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java index 439b3cf..098d1ca 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java @@ -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 ) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
