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

10 files changed, 13 insertions, 13 deletions

diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
index 8b68f8a102..b23cdfa565 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
@@ -31,7 +31,7 @@
     <name>Apache Tuscany SCA Base Runtime Aggregation</name>

 

     <properties>

-      <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>

+      <bundle-symbolic-name>${project.groupId}.${project.artifactId}</bundle-symbolic-name>

     </properties>

 

 

@@ -45,7 +45,7 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-base-runtime-pom</artifactId>

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

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

             <type>pom</type>

             <optional>true</optional>

             <exclusions>

diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
index 1765df5bea..6e896e93f5 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
@@ -34,7 +34,7 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-base-runtime</artifactId>

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

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

         </dependency>

         <dependency>

             <groupId>jline</groupId>

diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
index 468bee8455..9c93d600ac 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
@@ -34,7 +34,7 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

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

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

             <optional>true</optional>

         </dependency>

     </dependencies>

diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
index 33c7466a1b..2e6effbf4d 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
@@ -34,7 +34,7 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

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

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

             <optional>true</optional>

         </dependency>

     </dependencies>

diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 92801a9a3c..7b23674c39 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -121,7 +121,7 @@
                                          <descriptor>src/main/assembly/bin-default.xml</descriptor>
                                      </descriptors>
                                      <tarLongFileMode>gnu</tarLongFileMode>
-                                     <finalName>apache-tuscany-sca-all-${version}</finalName>
+                                     <finalName>apache-tuscany-sca-all-${project.version}</finalName>
                                      <appendAssemblyId>true</appendAssemblyId>
                                      <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
                                  </configuration>
@@ -163,7 +163,7 @@
                                          <descriptor>src/main/assembly/src.xml</descriptor>
                                      </descriptors>
                                      <tarLongFileMode>gnu</tarLongFileMode>
-                                     <finalName>apache-tuscany-sca-all-${version}</finalName>
+                                     <finalName>apache-tuscany-sca-all-${project.version}</finalName>
                                      <appendAssemblyId>true</appendAssemblyId>
                                      <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                                     <attach>true</attach>
@@ -470,7 +470,7 @@
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>apache-tuscany-sca-all-${version}</finalName>
+                            <finalName>apache-tuscany-sca-all-${project.version}</finalName>
                             <appendAssemblyId>true</appendAssemblyId>
                             <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                         </configuration>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
index 27816ddb00..3aa5aa3809 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
@@ -40,7 +40,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
    </build>
 
 </project>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
index d1ea28fc54..9497949fb5 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
@@ -40,6 +40,6 @@
     </dependencies>

 

     <build>

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

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

    </build>

 </project>

diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
index b11a6bb687..704ee91174 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
@@ -40,7 +40,7 @@
     </dependencies>

 

     <build>

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

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

    </build>

 

 </project>

diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
index d8a4831e82..67de9b020e 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
@@ -46,7 +46,7 @@
     </dependencies>

 

     <build>

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

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

    </build>

 

 </project>

diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
index 3b43a4fa59..e37b2021cb 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
@@ -40,6 +40,6 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
    </build>
 </project>