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

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

commit 84605ad8a9e32e5da566d7458fa30586840cc3e2
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Oct 8 15:37:09 2014 +0000

    Fix special configuration handling and effective model retrival
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1630146
 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cb079c9..3df257f 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
@@ -279,7 +279,7 @@ public abstract class ModelUtils {
         if ( result == null ) {
             final String contents = 
(String)project.getContextValue(EFFECTIVE_MODEL_TXT);
             try {
-                result = ModelReader.read(new StringReader(contents), null);
+                result = ModelUtility.getEffectiveModel(ModelReader.read(new 
StringReader(contents), null), null);
                 project.setContextValue(EFFECTIVE_MODEL, result);
             } catch ( final IOException ioe) {
                 throw new MojoExecutionException("Unable to read cached 
model.", ioe);

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to