From 53d3f1395e7fa53c0901d7c5331548847f123523 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 29 Mar 2011 09:14:06 +0000
Subject: [PATCH] Now using filtering in archetype to resolve version, instead
 of hardcoded version

---
 archetype/pom.xml                                    | 12 ++++++++++++
 .../archetype-resources/pom.xml                      | 12 ++++++------
 parent/pom.xml                                       |  7 +++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 rename archetype/src/main/{resources => filtered-resources}/archetype-resources/pom.xml (80%)

diff --git a/archetype/pom.xml b/archetype/pom.xml
index 7cacf42f..d7f4c86e 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -11,4 +11,16 @@
     <packaging>jar</packaging>
     <name>Spring WS Archetype</name>
     <description>Spring Web Services Maven2 Archetype.</description>
+    <build>
+        <resources>
+            <resource>
+              <directory>src/main/resources</directory>
+              <filtering>false</filtering>
+            </resource>
+            <resource>
+              <directory>src/main/filtered-resources</directory>
+              <filtering>true</filtering>
+            </resource>
+        </resources>    
+    </build>
 </project>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/filtered-resources/archetype-resources/pom.xml
similarity index 80%
rename from archetype/src/main/resources/archetype-resources/pom.xml
rename to archetype/src/main/filtered-resources/archetype-resources/pom.xml
index 68aaac69..dd1240a7 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/filtered-resources/archetype-resources/pom.xml
@@ -2,14 +2,14 @@
 <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>war</packaging>
-    <version>${version}</version>
-    <name>${artifactId} Spring-WS Application</name>
+    <version>\${version}</version>
+    <name>\${artifactId} Spring-WS Application</name>
     <url>http://www.springframework.org/spring-ws</url>
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>\${artifactId}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>2.0.0.RELEASE</version>
+            <version>@project.version@</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index b0a1dcbf..7e3409e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -79,6 +79,13 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
+                <plugin>
+                  <artifactId>maven-resources-plugin</artifactId>
+                  <version>2.5</version>
+                  <configuration>
+                    <escapeString>\</escapeString>
+                  </configuration>
+                </plugin>                
                 <plugin>
                     <groupId>com.springsource.bundlor</groupId>
                     <artifactId>com.springsource.bundlor.maven</artifactId>