This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-servlet-archetype.git
commit 9de7e4fcef5cb84dbd56844dac3b6629049979f8 Author: Robert Munteanu <[email protected]> AuthorDate: Thu May 15 08:36:08 2014 +0000 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. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1594818 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 13 +++------ src/main/resources/archetype-resources/pom.xml | 31 ++++++++++++---------- .../resources/projects/normal/reference/pom.xml | 15 ++++++----- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 6d396fe..03fae0c 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 332ff16..e3e7ff7 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -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> diff --git a/src/test/resources/projects/normal/reference/pom.xml b/src/test/resources/projects/normal/reference/pom.xml index ce932f2..7834625 100644 --- a/src/test/resources/projects/normal/reference/pom.xml +++ b/src/test/resources/projects/normal/reference/pom.xml @@ -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> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
