You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:36 UTC
[sling-slingstart-maven-plugin] 06/10: SLING-4790 : Removal of
artifacts from inherited model is not possible
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit f2865de2ed29b59f0d492206a242d07caa061a3a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 9 11:37:44 2015 +0000
SLING-4790 : Removal of artifacts from inherited model is not possible
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1684382 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/maven/slingstart/DependencyLifecycleParticipant.java | 2 +-
src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 895248a..4983ccc 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -385,7 +385,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
if (errors != null ) {
throw new MavenExecutionException("Invalid model at " + name + " : " + errors, (File)null);
}
- ModelUtility.merge(result, current);
+ ModelUtility.merge(result, current, false);
} finally {
IOUtils.closeQuietly(reader);
}
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 ccde9e4..951bd5b 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
@@ -99,7 +99,7 @@ public abstract class ModelUtils {
if ( firstArtifact == null ) {
firstArtifact = a;
} else {
- throw new MavenExecutionException("Base run mode should contain exactly one artifact.", (File)null);
+ throw new MavenExecutionException("Base run mode should contain exactly one artifact: ", (File)null);
}
}
if ( firstArtifact == null ) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.