This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag slingstart-maven-plugin-1.5.0 in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 21e28cf42894243ec2778de278c3e01c486b5a41 Author: Carsten Ziegeler <[email protected]> AuthorDate: Sun Oct 30 09:17:04 2016 +0000 SLING-6212 : Create more meaningful exception if no model is found for attach goal git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1767135 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f79fe6f..a886865 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.provisioning.model</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> diff --git a/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java b/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java index a454bd0..d03023b 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java @@ -102,7 +102,11 @@ public abstract class ProjectHelper { Model result = (Model) project.getContextValue(RAW_MODEL_CACHE); if ( result == null ) { try { - final StringReader r = new StringReader((String)project.getContextValue(RAW_MODEL_TXT)); + final String text = (String)project.getContextValue(RAW_MODEL_TXT); + if ( text == null ) { + throw new MojoExecutionException("No provisioning model found in project."); + } + final StringReader r = new StringReader(text); result = ModelReader.read(r, project.getId()); project.setContextValue(RAW_MODEL_CACHE, result); } catch ( final IOException ioe) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
