You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/08/26 16:04:12 UTC
svn commit: r1697936 -
/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Author: cziegeler
Date: Wed Aug 26 14:04:12 2015
New Revision: 1697936
URL: http://svn.apache.org/r1697936
Log:
SLING-4969 : Store aggregated model as artifact
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.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=1697936&r1=1697935&r2=1697936&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 Wed Aug 26 14:04:12 2015
@@ -171,7 +171,8 @@ public class DependencyLifecycleParticip
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 DependencyLifecycleParticip
}
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);
}
}
}