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

21 files changed, 27 insertions, 27 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
index 01555e08df..eca47cb8e8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
@@ -44,7 +44,7 @@
     </dependencies>
     
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
        <plugins>
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index c511880900..f611d71402 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
@@ -45,7 +45,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

           <plugin>

              <groupId>org.apache.tuscany.maven.plugins</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index bb56cd4eaf..eb3eda368a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -59,7 +59,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

           <plugin>

              <groupId>org.apache.tuscany.maven.plugins</groupId>

@@ -80,7 +80,7 @@
                             <tasks>

                                 <ant antfile="./build-dojo.xml" target="unpack-dojo-files">

                                     <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${artifactId}"/>

+                                    <property name="artifactId" value="${project.artifactId}"/>

                                 </ant>

                             </tasks>

                         </configuration>

@@ -95,7 +95,7 @@
                             <tasks>

                                 <ant antfile="./build-dojo.xml" target="clean-dojo-files">

                                     <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${artifactId}"/>

+                                    <property name="artifactId" value="${project.artifactId}"/>

                                 </ant>

                             </tasks>

                         </configuration>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
index 4fda33803a..d8257ed8ee 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
@@ -61,7 +61,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
        <plugins>
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
index 7c862beee7..01807f6b87 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
@@ -61,7 +61,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
        <plugins>
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index 6f08be42ed..fb102b7c32 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
@@ -45,7 +45,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
        <plugins>
           <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index 76cd542889..33ab0cde19 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
@@ -45,7 +45,7 @@
     </dependencies>

 

     <build>

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

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

 

        <plugins>

        </plugins>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
index d2472291e1..3f2f9e4177 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
@@ -100,7 +100,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
 
 
         <plugins>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
index 37e9fef9f7..c1b66724e9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml
@@ -112,7 +112,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

          <plugin>

              <groupId>org.apache.tuscany.maven.plugins</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index 1de7aff7a5..e0b5d6962e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
@@ -94,7 +94,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
@@ -132,7 +132,7 @@
                    <dependency>
                       <groupId>org.apache.tuscany.sca</groupId>
                       <artifactId>tuscany-node-launcher-equinox</artifactId>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                    </dependency>
                 </dependencies>
                 <executions>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
index 9739662478..978ada93d0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
@@ -88,7 +88,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
@@ -126,7 +126,7 @@
                    <dependency>
                       <groupId>org.apache.tuscany.sca</groupId>
                       <artifactId>tuscany-node-launcher-equinox</artifactId>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                    </dependency>
                 </dependencies>
                 <executions>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
index f847ff9322..611b5a9366 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
@@ -46,7 +46,7 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+       <finalName>${project.artifactId}</finalName>
        <plugins>
 
          <plugin>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
index 9aea2223b3..a6c338475f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
@@ -52,7 +52,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

 

          <!-- plugin to support zip packaging for SCA contributions -->

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
index ab959a5f54..ef462dffba 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
@@ -46,7 +46,7 @@
     </dependencies>

 

     <build>

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

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

 

        <plugins>

 

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index 5b5375f6db..e43f92a862 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
@@ -44,7 +44,7 @@
     </dependencies>

     

     <build>

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

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

        <plugins>

          <plugin>

              <groupId>org.apache.tuscany.maven.plugins</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index 8aee7b735d..f084b0ec3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
@@ -94,7 +94,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
@@ -133,7 +133,7 @@
                    <dependency>
                       <groupId>org.apache.tuscany.sca</groupId>
                       <artifactId>tuscany-node-launcher-equinox</artifactId>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                    </dependency>
                 </dependencies>
                 <executions>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
index f15cab63b1..0a436fc560 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
@@ -88,7 +88,7 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
@@ -126,7 +126,7 @@
                    <dependency>
                       <groupId>org.apache.tuscany.sca</groupId>
                       <artifactId>tuscany-node-launcher-equinox</artifactId>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                    </dependency>
                 </dependencies>
                 <executions>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index 11836ec19b..cd1be13214 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
@@ -45,7 +45,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

           <plugin>

              <groupId>org.apache.tuscany.maven.plugins</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
index a1e1c86706..b4cb31e1ef 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
@@ -45,7 +45,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

 

          <!-- plugin to support using mvn tuscany:run to run this contribution -->

diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
index 2122876b47..a29fdc345d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
@@ -47,7 +47,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

          <plugin>

            <groupId>org.codehaus.mojo</groupId>

diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
index a123478729..a9c4ef0dc0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
@@ -47,7 +47,7 @@
     </dependencies>

 

     <build>

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

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

        <plugins>

          <plugin>

            <groupId>org.codehaus.mojo</groupId>