Merge revision r944737 from 1.0 release branch

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

37 files changed, 32 insertions, 37 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
index 5f36065a5b..b5e12d98de 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-blog-feed</artifactId>

     <name>Apache Tuscany SCA Tours Blog Feed Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
index b43706c55e..2cbf13c465 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-buildingblocks</artifactId>

     <name>Apache Tuscany SCA Tours Building Blocks Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
index 3f48c97f2a..d491e1032b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-currency-converter-corba</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter CORBA Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
index db54525784..7668bd8a62 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-currency-converter-jms</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
index 14e4a77e3d..bc023c48a4 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-currency-converter-rmi</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
index bddb75987a..afe48b325f 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>

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

     </parent>

-    <version>1.0-SNAPSHOT</version>

     <artifactId>scatours-launcher-currency-converter-ws</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
index 20cbc7dbff..323e0e6827 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-currency-converter</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
index 7fef1796f7..e5502ea5a0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-launcher-databinding</artifactId>
     <name>Apache Tuscany SCA Tours Databinding Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
index fb5a788652..b3d82f42d0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>

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

     </parent>

-    <version>1.0-SNAPSHOT</version>

     <artifactId>scatours-launcher-feed-logger</artifactId>

     <name>Apache Tuscany SCA Tours Feed Logger Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
index eb7604506d..f8f0359040 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-fullapp-domain</artifactId>

     <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>

     

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
index 28f5e93074..7044caf3ee 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-fullapp-nodes</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
index 70bef29299..5719ba9520 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-launcher-fullapp</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
index b26030fb77..16ea9f9834 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-help-pages</artifactId>

     <name>Apache Tuscany SCA Tours Help Pages Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
index 7e15913e53..3d9afcd726 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-interaction</artifactId>

     <name>Apache Tuscany SCA Tours Interaction Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
index 7385505063..b86c99b63c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-introducing-client</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Client Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
index 43d256e212..fb2f48b447 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-introducing-domain</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Domain Launcher</name>

     

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
index 5970149bc9..d18a670904 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-introducing-tours</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Tours Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
index ec5da820e7..8d2ef26877 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-introducing-trips</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Trips Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
index 98c8627d6c..36a5f9647b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-introducing</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
index c5f50cb8df..e70173619d 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-jumpstart</artifactId>

     <name>Apache Tuscany SCA Tours Jump Start Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
index 077e5e724f..643edc9445 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-notification-corba</artifactId>

     <name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
index 1dd95cf3e5..a70f7b2556 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-notification-ejb</artifactId>

     <name>Apache Tuscany SCA Tours Notification EJB Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
index 3b20798e40..02a4b462b5 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-notification-jms</artifactId>

     <name>Apache Tuscany SCA Tours Notification JMS Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
index 69590fa45e..9ab98240d1 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-notification-rmi</artifactId>

     <name>Apache Tuscany SCA Tours Notification RMI Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
index c5dd336d6b..816006ea10 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-notification-ws</artifactId>

     <name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>

 

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
index 811bb6a9ed..4018c194ef 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-bpel</artifactId>
     <name>Apache Tuscany SCA Tours Payment BPEL Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
index b46c58001c..0e351c2a78 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-groovy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Groovy Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
index d4ea82f62c..70f97ed9b6 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-java-callback</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Callback Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
index 4d6823400c..e8a7c80c2b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-java-policy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Policy Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
index 6046fcab91..33f8a8dd84 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-java-reference-pass</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Callback Reference Pass</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
index 2a2bb63532..3276595fb3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-java</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
index 97ba34d3ab..a5d9998d61 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-python</artifactId>
     <name>Apache Tuscany SCA Tours Payment Python Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
index c44f53ad1a..1730409c94 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-spring-scatag</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring SCATag Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
index 013c7e1482..d29b9680ed 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-payment-spring</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
index dc72d0c3c0..43b8b706fd 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent>
     <artifactId>scatours-launcher-policy</artifactId>
     <name>Apache Tuscany SCA Tours Policy Launcher</name>
 
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/pom.xml
index f3301b4793..8df7db17cc 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>

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

     </parent>

-    <version>1.0-SNAPSHOT</version>

     <artifactId>scatours-launchers</artifactId>

     <packaging>pom</packaging>

     <name>Apache Tuscany SCA Tours Launchers</name>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml
index 66144b037c..3de04e9b36 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

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

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent>

     <artifactId>scatours-launcher-usingsca</artifactId>

     <name>Apache Tuscany SCA Tours Using SCA Components Launcher</name>