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 2014/05/15 10:36:10 UTC
svn commit: r1594818 - in /sling/trunk/tooling/maven/archetypes:
bundle-for-jcrinstall/
bundle-for-jcrinstall/src/main/resources/archetype-resources/
bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/
bundle-for-jcrinstall/src/...
Author: rombert
Date: Thu May 15 08:36:08 2014
New Revision: 1594818
URL: http://svn.apache.org/r1594818
Log:
SLING-3520 - Consolidate archetype plugin versions in a parent pom
Update all archetypes to use the archetype parent. Projects missing
verification now run a simple verify script which validates that the
build was successful and no warnings were generated.
Added:
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties (with props)
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt (with props)
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/bundle/src/test/
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties (with props)
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt (with props)
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/initial-content/src/test/
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties (with props)
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt (with props)
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties (with props)
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt (with props)
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties (with props)
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt (with props)
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy
Modified:
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
sling/trunk/tooling/maven/archetypes/bundle/pom.xml
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
sling/trunk/tooling/maven/archetypes/initial-content/pom.xml
sling/trunk/tooling/maven/archetypes/initial-content/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/servlet/pom.xml
sling/trunk/tooling/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml
sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml
sling/trunk/tooling/maven/archetypes/taglib/pom.xml
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml Thu May 15 08:36:08 2014
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>sling-jcrinstall-bundle-archetype</artifactId>
@@ -44,15 +44,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
</project>
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -19,18 +19,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
<packaging>bundle</packaging>
- <version>${version}</version>
- <name>${artifactId}</name>
- <description>${groupId} - ${artifactId}</description>
+ <version>\${version}</version>
+ <name>\${artifactId}</name>
+ <description>\${groupId} - \${artifactId}</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
+ <version>${scrplugin.version}</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,13 +44,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>${bundleplugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>${compilerplugin.version}</version>
+ <configuration>
+ <source>${archetype.java.version}</source>
+ <target>${archetype.java.version}</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -82,25 +85,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>${slingapi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>${slf4japi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>${scrannotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -112,7 +115,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
@@ -137,4 +140,7 @@
</build>
</profile>
</profiles>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java Thu May 15 08:36:08 2014
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*
* @see <a href="https://sling.apache.org/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service</a>
*/
-@Component(metatype=true)
+@Component
@Service
@Property( name="scheduler.period", longValue = 10)
public class SimpleDSComponent implements Runnable {
@@ -50,7 +50,7 @@ public class SimpleDSComponent implement
this.bundleContext = ctx.getBundleContext();
}
- protected void deactivate() {
+ protected void deactivate(ComponentContext ctx) {
this.bundleContext = null;
}
Added: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties (added)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties Thu May 15 08:36:08 2014
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-jcrinstall-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.jcrinstall.bundle.testing
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt (added)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt Thu May 15 08:36:08 2014
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy (added)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy Thu May 15 08:36:08 2014
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/tooling/maven/archetypes/bundle/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/pom.xml Thu May 15 08:36:08 2014
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>sling-bundle-archetype</artifactId>
@@ -44,15 +44,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
</project>
Modified: sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -19,18 +19,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
<packaging>bundle</packaging>
- <version>${version}</version>
- <name>${artifactId}</name>
- <description>${groupId} - ${artifactId}</description>
+ <version>\${version}</version>
+ <name>\${artifactId}</name>
+ <description>\${groupId} - \${artifactId}</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.13.0</version>
+ <version>${scrplugin.version}</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -39,21 +39,21 @@
</goals>
</execution>
</executions>
- <configuration>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>${bundleplugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>${compilerplugin.version}</version>
+ <configuration>
+ <source>${archetype.java.version}</source>
+ <target>${archetype.java.version}</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -85,25 +85,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>${slingapi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>${slf4japi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.0</version>
+ <version>${scrannotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
@@ -134,4 +134,7 @@
</build>
</profile>
</profiles>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
Modified: sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/SimpleDSComponent.java Thu May 15 08:36:08 2014
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*
* @see <a href="https://sling.apache.org/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service</a>
*/
-@Component(metatype=true)
+@Component
@Service
@Property( name="scheduler.period", longValue = 10)
public class SimpleDSComponent implements Runnable {
@@ -50,7 +50,7 @@ public class SimpleDSComponent implement
this.bundleContext = ctx.getBundleContext();
}
- protected void deactivate() {
+ protected void deactivate(ComponentContext ctx) {
this.bundleContext = null;
}
Added: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties (added)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties Thu May 15 08:36:08 2014
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.bundle.testing
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt (added)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt Thu May 15 08:36:08 2014
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy (added)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy Thu May 15 08:36:08 2014
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/tooling/maven/archetypes/initial-content/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/initial-content/pom.xml Thu May 15 08:36:08 2014
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>sling-initial-content-archetype</artifactId>
@@ -44,16 +44,9 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
<reporting>
Modified: sling/trunk/tooling/maven/archetypes/initial-content/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -19,21 +19,23 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
<packaging>bundle</packaging>
- <version>${version}</version>
- <name>${artifactId}</name>
- <description>${groupId} - ${artifactId}</description>
+ <version>\${version}</version>
+ <name>\${artifactId}</name>
+ <description>\${groupId} - \${artifactId}</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>${bundleplugin.version}</version>
<configuration>
<instructions>
+ <!-- Stop bnd complaining about unused Private-Package instructions -->
+ <Private-Package></Private-Package>
<Sling-Nodetypes>
SLING-INF/nodetypes/nodetypes.cnd
</Sling-Nodetypes>
@@ -54,7 +56,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
@@ -73,4 +75,7 @@
</build>
</profile>
</profiles>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
Added: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties (added)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties Thu May 15 08:36:08 2014
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.initialcontent.testing
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt (added)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt Thu May 15 08:36:08 2014
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy (added)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy Thu May 15 08:36:08 2014
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml Thu May 15 08:36:08 2014
@@ -15,9 +15,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>sling-launchpad-standalone-archetype</artifactId>
<version>1.0.1-SNAPSHOT</version>
@@ -36,15 +36,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
</project>
Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -14,18 +14,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
+ <version>\${version}</version>
<packaging>jar</packaging>
- <name>${artifactId} Launchpad Standalone</name>
- <description>${artifactId} Launchpad Standalone</description>
+ <name>\${artifactId} Launchpad Standalone</name>
+ <description>\${artifactId} Launchpad Standalone</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.0.10</version>
+ <version>${launchpadplugin.version}</version>
<executions>
<execution>
<id>prepare-package-jar</id>
@@ -48,6 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>${jarplugin.version}</version>
<configuration>
<archive>
<manifestFile>${symbol_dollar}{project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -68,4 +69,7 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
Added: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties Thu May 15 08:36:08 2014
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.launchpadstandalone.testing
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt Thu May 15 08:36:08 2014
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy Thu May 15 08:36:08 2014
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml Thu May 15 08:36:08 2014
@@ -15,9 +15,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>sling-launchpad-webapp-archetype</artifactId>
<version>1.0.1-SNAPSHOT</version>
@@ -36,15 +36,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
</build>
</project>
Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -14,18 +14,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
+ <version>\${version}</version>
<packaging>war</packaging>
- <name>${artifactId} Launchpad Webapp</name>
- <description>${artifactId} Launchpad Webapp</description>
+ <name>\${artifactId} Launchpad Webapp</name>
+ <description>\${artifactId} Launchpad Webapp</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.0.10</version>
+ <version>${launchpadplugin.version}</version>
<executions>
<execution>
<id>prepare-package-war</id>
@@ -44,6 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>${warplugin.version}</version>
<configuration>
<webResources>
<resource>
@@ -66,7 +67,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.23</version>
+ <version>${jettyplugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -81,4 +82,7 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+ <properties>
+ <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+ </properties>
</project>
Added: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties Thu May 15 08:36:08 2014
@@ -0,0 +1,4 @@
+groupId=org.apache.sling
+artifactId=test-bundle-archetype-project
+version=0.0.1-SNAPSHOT
+package=org.apache.sling.archetype.launchpadwebapp.testing
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt Thu May 15 08:36:08 2014
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Propchange: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy?rev=1594818&view=auto
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy (added)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy Thu May 15 08:36:08 2014
@@ -0,0 +1,9 @@
+new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
+ if ( logFile.name == "build.log" ) {
+ logFile.eachLine { line ->
+ if ( line.contains("WARNING") ) {
+ throw new RuntimeException("Warning found in line ${line}\nIn file ${logFile}");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/tooling/maven/archetypes/servlet/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/pom.xml Thu May 15 08:36:08 2014
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
@@ -60,16 +60,11 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
<plugins>
<plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: sling/trunk/tooling/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml Thu May 15 08:36:08 2014
@@ -19,18 +19,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId}</artifactId>
<packaging>bundle</packaging>
- <version>${version}</version>
- <name>${artifactId}</name>
- <description>${groupId} - ${artifactId}</description>
+ <version>\${version}</version>
+ <name>\${artifactId}</name>
+ <description>\${groupId} - \${artifactId}</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
+ <version>${scrplugin.version}</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,13 +44,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>${bundleplugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>${compilerplugin.version}</version>
+ <configuration>
+ <source>${archetype.java.version}</source>
+ <target>${archetype.java.version}</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -82,25 +85,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>${slingapi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>${slf4japi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>${scrannotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -116,7 +119,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>${slingplugin.version}</version>
<executions>
<execution>
<id>install-bundle</id>
Modified: sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml Thu May 15 08:36:08 2014
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
+ <version>1.16.0</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,13 +44,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.0.1</version>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- use version 2.3.2 to have java 1.5 as the default -->
- <version>2.3.2</version>
+ <version>3.1</version>
+ <configuration>
+ <source>6</source>
+ <target>6</target>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -94,7 +97,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>1.9.8</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -116,7 +119,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.1.0</version>
<executions>
<execution>
<id>install-bundle</id>
Modified: sling/trunk/tooling/maven/archetypes/taglib/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/taglib/pom.xml?rev=1594818&r1=1594817&r2=1594818&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/taglib/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/taglib/pom.xml Thu May 15 08:36:08 2014
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>19</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <artifactId>sling-archetype-parent</artifactId>
+ <version>1</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-taglib-archetype</artifactId>
@@ -60,11 +60,6 @@
</extensions>
<plugins>
<plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>