[sling-slingstart-maven-plugin] 02/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 e3c69675959eff12416b5299fd1d7c1cbb83831a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:04:12 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@1697936 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/maven/slingstart/DependencyLifecycleParticipant.java | 4 +++-
 1 file changed, 3 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 31e2d93..07651e5 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -171,7 +171,8 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
         for(final Model d : dependencies) {
             ModelUtility.merge(info.model, d);
         }
-        ModelUtility.merge(info.model, effectiveModel);
+        ModelUtility.merge(info.model, info.localModel);
+        info.localModel = info.model;
         info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
 
         final Map<Traceable, String> errors = ModelUtility.validate(info.model);
@@ -331,6 +332,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
                     }
                     for(final org.apache.sling.provisioning.model.Artifact r : removeList) {
                         group.remove(r);
+                        info.localModel.getFeature(feature.getName()).getRunMode(runMode.getNames()).getArtifactGroup(group.getStartLevel()).remove(r);
                     }
                 }
             }

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