Fix lots of depricated maven variable warnings for Maven v3

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1067440 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 24 insertions, 24 deletions

diff --git a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
index 2ed94936a9..583ff605b6 100644
--- a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
@@ -26,9 +26,9 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

 

-    <artifactId>binding-${artifactId}</artifactId>

+    <artifactId>binding-${project.artifactId}</artifactId>

     <groupId>${groupId}</groupId>

-    <version>${version}</version>

+    <version>${project.version}</version>

     <name>Apache Tuscany SCA ${bindingName} Binding Extension</name>

 

     <dependencies>

diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index 8b2ad3d3a9..5a2755a325 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
-	<name>${artifactId}</name>
+	<artifactId>${project.artifactId}</artifactId>
+	<version>${project.version}</version>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 
@@ -46,7 +46,7 @@
 
 	<build>
             <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
+            <finalName>${project.artifactId}</finalName>
 
 		<plugins>
 			<plugin>
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index 873b45ee39..76183eafc7 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${project.artifactId}</artifactId>
     <packaging>jar</packaging>
-    <version>${version}</version>
+    <version>${project.version}</version>
     #literal() <!-- TODO project name  -->
     <name>quickstart</name>
     <description></description>
@@ -64,7 +64,7 @@
     </dependencies>
     <build>
         <defaultGoal>install</defaultGoal>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <resource>
                 <filtering>false</filtering>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index 30be6b66e3..ecc47712a9 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
+	<artifactId>${project.artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	#literal()<!-- TODO project name  -->
 	<name>quickstart</name>
 	<description></description>
@@ -81,7 +81,7 @@
 	</dependencies>
 	<build>
             <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
+            <finalName>${project.artifactId}</finalName>
 		<resources>
 			<resource>
 				<filtering>false</filtering>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index f252e602ab..19c1181f1b 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
+	<artifactId>${project.artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	#literal()<!-- TODO project name  -->
 	<name>quickstart-jsf</name>
 	<description></description>
@@ -89,7 +89,7 @@
 
 	<build>
             <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
+            <finalName>${project.artifactId}</finalName>
 		<resources>
 			<resource>
 				<filtering>false</filtering>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index 8fc4bde625..95c2f5800d 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>${groupId}</groupId>

-	<artifactId>${artifactId}</artifactId>

+	<artifactId>${project.artifactId}</artifactId>

 	<packaging>war</packaging>

-	<version>${version}</version>

+	<version>${project.version}</version>

 	<name>quickstart-jsonp</name>

 

 	<dependencies>

@@ -92,7 +92,7 @@
 	</dependencies>

 	<build>

             <defaultGoal>install</defaultGoal>

-            <finalName>${artifactId}</finalName>

+            <finalName>${project.artifactId}</finalName>

 		<resources>

 			<resource>

 				<filtering>false</filtering>

diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index 312affaba9..8e8bbe128f 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
+	<artifactId>${project.artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	#literal()<!-- TODO project name  -->
 	<name>quickstart-stripes</name>
 	<description></description>
@@ -59,7 +59,7 @@
 
 	<build>
             <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
+            <finalName>${project.artifactId}</finalName>
 		<resources>
 			<resource>
 				<filtering>false</filtering>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index bad07a995e..3ec16988b1 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -22,9 +22,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
+	<artifactId>${project.artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>quickstart</name>
 
 	<dependencies>
@@ -81,7 +81,7 @@
 	</dependencies>
 	<build>
             <defaultGoal>install</defaultGoal>
-            <finalName>${artifactId}</finalName>
+            <finalName>${project.artifactId}</finalName>
 		<resources>
 			<resource>
 				<filtering>false</filtering>