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:25:40 UTC
[sling-slingstart-maven-plugin] 11/27: Update to Sling Parent POM
22 with baselining enabled
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 46b238722d751b2ee9b13687fb1be1d61a54fe89
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:34:43 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1628609 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java | 4 ++--
.../apache/sling/maven/slingstart/DependencyLifecycleParticipant.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e7fb6de..1e898ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
index 0e8057c..bc53b23 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
@@ -30,8 +30,8 @@ import org.apache.sling.provisioning.model.Model;
public abstract class AbstractSlingStartMojo extends AbstractMojo {
- @Parameter(defaultValue="${basedir}/src/main/systems")
- protected File systemsDirectory;
+ @Parameter(defaultValue="${basedir}/src/main/models")
+ private File systemsDirectory;
@Parameter(property = "project", readonly = true, required = true)
protected MavenProject project;
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 a2ee354..da31e74 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -108,7 +108,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
}
final String directory = nodeValue((Xpp3Dom) plugin.getConfiguration(),
- "systemsDirectory", new File(project.getBasedir(), "src/main/systems").getAbsolutePath());
+ "systemsDirectory", new File(project.getBasedir(), "src/main/models").getAbsolutePath());
final Model model = ModelUtils.readFullModel(new File(directory), dependencies, project, session, log);
ModelUtils.storeRawModel(project, model);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.