svn commit: r1793494 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java

[cziegeler]

Author: cziegeler
Date: Tue May  2 13:55:44 2017
New Revision: 1793494

URL: http://svn.apache.org/viewvc?rev=1793494&view=rev
Log:
SLING-6819 : Includes are removed from attached model

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

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java?rev=1793494&r1=1793493&r2=1793494&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
 Tue May  2 13:55:44 2017
@@ -159,15 +159,18 @@ public class ModelPreprocessor {
                     nodeBooleanValue(info.plugin, 
"allowUnresolvedPomDependencies", false)));
         }
 
+        final Model copyModel = new Model();
+        this.mergeModels(copyModel, info.localModel);
+
         // we have to create an effective model to add the dependencies
-        final Model effectiveModel = 
ModelUtility.getEffectiveModel(info.localModel, resolverOptions);
+        final Model effectiveModel = ModelUtility.getEffectiveModel(copyModel, 
resolverOptions);
 
-        final List<Model> dependencies = searchSlingstartDependencies(env, 
info, info.localModel, effectiveModel);
+        final List<Model> dependencies = searchSlingstartDependencies(env, 
info, copyModel, effectiveModel);
         info.model = new Model();
         for(final Model d : dependencies) {
             this.mergeModels(info.model, d);
         }
-        this.mergeModels(info.model, info.localModel);
+        this.mergeModels(info.model, copyModel);
         info.model = ModelUtility.getEffectiveModel(info.model, 
resolverOptions);
 
         final Map<Traceable, String> errors = 
ModelUtility.validate(info.model);