You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2013/03/12 22:17:27 UTC
svn commit: r1455719 - in /shindig/trunk/java/sample-maven-archetype:
pom.xml src/main/resources/archetype-resources/pom.xml
Author: ssievers
Date: Tue Mar 12 21:17:26 2013
New Revision: 1455719
URL: http://svn.apache.org/r1455719
Log:
SHINDIG-1913 | The Sample Archetype should have the most recent Shindig dependencies
Modified:
shindig/trunk/java/sample-maven-archetype/pom.xml
shindig/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml
Modified: shindig/trunk/java/sample-maven-archetype/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/sample-maven-archetype/pom.xml?rev=1455719&r1=1455718&r2=1455719&view=diff
==============================================================================
--- shindig/trunk/java/sample-maven-archetype/pom.xml (original)
+++ shindig/trunk/java/sample-maven-archetype/pom.xml Tue Mar 12 21:17:26 2013
@@ -34,6 +34,26 @@
<description>Default server war dependencies</description>
<build>
+ <!--
+ Replace some property values in the archetype pom upon generation of the archetype, see
+ http://stackoverflow.com/questions/7223031/how-to-embed-archetype-project-version-in-maven-archetype
+ -->
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>archetype-resources/pom.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>archetype-resources/pom.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -48,6 +68,14 @@
<artifactId>maven-archetype-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: shindig/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1455719&r1=1455718&r2=1455719&view=diff
==============================================================================
--- shindig/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ shindig/trunk/java/sample-maven-archetype/src/main/resources/archetype-resources/pom.xml Tue Mar 12 21:17:26 2013
@@ -19,9 +19,9 @@
-->
<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>Demo Webapp for Apache Shindig</name>
<url>http://shindig.apache.org</url>
@@ -58,27 +58,27 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
- <version>2.5.0-beta5</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <version>2.5.0-beta5</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
- <version>2.5.0-beta5</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
- <version>2.5.0-beta5</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-extras</artifactId>
- <version>2.5.0-beta5</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>