Update pom.xml to reference a consistent version of tuscany runtime using ${tuscany.version}

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

2 files changed, 30 insertions, 7 deletions

diff --git a/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml
index a401fc0bc7..52bca6fb09 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

-        <!--relativePath>../../pom.xml</relativePath-->

+        <artifactId>tuscany-scatours</artifactId>

+        <version>1.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

     </parent>

     <version>1.0-SNAPSHOT</version>

     <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>

@@ -35,28 +35,28 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

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

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

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

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

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

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-            <version>1.0-SNAPSHOT</version>

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

         </dependency>

     </dependencies>

 

diff --git a/sandbox/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..898321c510
--- /dev/null
+++ b/sandbox/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:creditcard-webapp" />
+</contribution>