[sling-slingstart-maven-plugin] 03/05: SLING-4969 : Store aggregated model as artifact

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag slingstart-maven-plugin-1.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git

commit e52e8a2943cc27c2b26705075c1d55b91f167949
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:32:28 2015 +0000

    SLING-4969 : Store aggregated model as artifact
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1697946 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/maven/slingstart/DependencyLifecycleParticipant.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 07651e5..692bc56 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -353,10 +353,9 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
         for(final Model d : dependencies) {
             ModelUtility.merge(mergingModel, d);
         }
-        ModelUtility.merge(mergingModel, effectiveModel);
-        mergingModel = ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions());
+        ModelUtility.merge(mergingModel, rawModel);
 
-        final Map<Traceable, String> errors = ModelUtility.validate(mergingModel);
+        final Map<Traceable, String> errors = ModelUtility.validate(ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions()));
         if ( errors != null ) {
             throw new MavenExecutionException("Unable to create model file for " + dep + " : " + errors, (File)null);
         }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.