sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1628609 - in /sling/trunk/tooling: maven/adapter-annotations/ maven/maven-jcrocm-plugin/ maven/maven-jspc-plugin/ maven/maven-launchpad-plugin/ maven/maven-sling-plugin/ maven/slingstart-maven-plugin/ maven/slingstart-maven-plugin/src/main...
Date Wed, 01 Oct 2014 06:34:43 GMT
Author: cziegeler
Date: Wed Oct  1 06:34:43 2014
New Revision: 1628609

URL: http://svn.apache.org/r1628609
Log:
Update to Sling Parent POM 22 with baselining enabled

Modified:
    sling/trunk/tooling/maven/adapter-annotations/pom.xml
    sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml
    sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml
    sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml
    sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
    sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
    sling/trunk/tooling/support/slingstart-model/pom.xml

Modified: sling/trunk/tooling/maven/adapter-annotations/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/adapter-annotations/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/adapter-annotations/pom.xml (original)
+++ sling/trunk/tooling/maven/adapter-annotations/pom.xml Wed Oct  1 06:34:43 2014
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>sling</artifactId>
         <groupId>org.apache.sling</groupId>
-        <version>20</version>
+        <version>22</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.sling</groupId>

Modified: sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml Wed Oct  1 06:34:43 2014
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.sling</groupId>
 		<artifactId>sling</artifactId>
-		<version>20</version>
+		<version>22</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

Modified: sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml Wed Oct  1 06:34:43 2014
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>20</version>
+        <version>22</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml Wed Oct  1 06:34:43 2014
@@ -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>
 

Modified: sling/trunk/tooling/maven/maven-sling-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Wed Oct  1 06:34:43 2014
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>20</version>
+        <version>22</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml Wed Oct  1 06:34:43 2014
@@ -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>
 

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
Wed Oct  1 06:34:43 2014
@@ -30,8 +30,8 @@ import org.apache.sling.provisioning.mod
 
 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;

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Wed Oct  1 06:34:43 2014
@@ -108,7 +108,7 @@ public class DependencyLifecycleParticip
         }
 
         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);

Modified: sling/trunk/tooling/support/slingstart-model/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/pom.xml?rev=1628609&r1=1628608&r2=1628609&view=diff
==============================================================================
--- sling/trunk/tooling/support/slingstart-model/pom.xml (original)
+++ sling/trunk/tooling/support/slingstart-model/pom.xml Wed Oct  1 06:34:43 2014
@@ -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>
 



Mime
View raw message