122 files changed, 91 insertions, 131 deletions
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/bundle/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/bundle/pom.xml
index 94bdfd5a81..b42b18ea4e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/bundle/pom.xml
@@ -25,8 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
     <artifactId>scatours-binaries-bundle</artifactId>
     <name>Apache Tuscany SCA Tours Binaries Bundle</name>
     <packaging>pom</packaging>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/jaxws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/jaxws/pom.xml
index 5d426e7c27..61c3fa711e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/jaxws/pom.xml
@@ -25,13 +25,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
-    <!-- This module brings in the JAX-WS runtime dependencies that are needed when running on JDK 5. -->
     <artifactId>scatours-binaries-jaxws</artifactId>
     <name>Apache Tuscany SCA Tours Binaries JAX-WS Dependencies for JDK 5</name>
     <packaging>pom</packaging>
 
+    <!-- This module brings in the JAX-WS runtime dependencies that are needed when running on JDK 5. -->
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/ode/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/ode/pom.xml
index b250c553e5..b2eb4d5d3d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/ode/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/ode/pom.xml
@@ -25,13 +25,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
-    <!-- This module brings in the database needed by the ODE runtime. -->
     <artifactId>scatours-binaries-ode</artifactId>
     <name>Apache Tuscany SCA Tours Binaries ODE Database</name>
     <packaging>pom</packaging>
 
+    <!-- This module brings in the database needed by the ODE runtime. -->
+
     <dependencies>
         <dependency>
             <groupId>org.apache.ode</groupId>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/openejb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/openejb/pom.xml
index 132a1e19bc..2f763844a1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/openejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/openejb/pom.xml
@@ -25,8 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
     <artifactId>scatours-binaries-openejb</artifactId>
     <name>Apache Tuscany SCA Tours Binaries OpenEJB Dependencies</name>
     <packaging>pom</packaging>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/pom.xml
index ffd9557646..31b2b28ec8 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/pom.xml
@@ -25,8 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
     <artifactId>scatours-binaries</artifactId>
     <name>Apache Tuscany SCA Tours Binaries</name>
     <packaging>pom</packaging>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-corba/pom.xml
index 1414ee706b..9454d70678 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/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-client-currency-converter-corba</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter CORBA Client</name>
     
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-jms/pom.xml
index 55b499e314..462b7ceb55 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-jms/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-client-currency-converter-jms</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter JMS Client</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-rmi/pom.xml
index 69a0527d4b..d1ff485ef8 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/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-client-currency-converter-rmi</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter RMI Client</name>
     
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/pom.xml
index 8513023a92..26269fa134 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/currency-converter-ws-jaxws/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-client-currency-converter-ws-jaxws</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Web Service JAX-WS Client</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/pom.xml
index 177da15528..4b6e990196 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/clients/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-clients</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours non-SCA Clients</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/blog-feed/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/blog-feed/pom.xml
index a7381b3c14..9ebbed08a5 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/blog-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-blog-feed</artifactId>
     <name>Apache Tuscany SCA Tours Blog Feed Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks-client/pom.xml
index 20a5d8bce4..27c4212478 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks-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-contribution-buildingblocks-client</artifactId>
     <name>Apache Tuscany SCA Tours Building Blocks Client Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks/pom.xml
index 32985041a7..844a642cae 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/buildingblocks/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-buildingblocks</artifactId>
     <name>Apache Tuscany SCA Tours Building Blocks Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/calendar/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/calendar/pom.xml
index 489f26240c..ac14a18866 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/calendar/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/calendar/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-contribution-calendar</artifactId>
     <name>Apache Tuscany SCA Tours Calendar Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/car/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/car/pom.xml
index 6d39e6d7f0..ff8d4da9b3 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/car/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/car/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-contribution-car</artifactId>
     <name>Apache Tuscany SCA Tours Car Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/common/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/common/pom.xml
index 8956abcff9..84bd01bdbd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/common/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-contribution-common</artifactId>
     <name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb-policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb-policy/pom.xml
index ea0923d8c9..8edaed7c84 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb-policy/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-creditcard-payment-jaxb-policy</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB Policy</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb/pom.xml
index 4f663e0af2..9f520ba1aa 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-jaxb/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-sdo/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-sdo/pom.xml
index ff894aee12..07ca3ad3bc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-sdo/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-contribution-creditcard-payment-sdo</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution SDO</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-webapp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-webapp/pom.xml
index 88b9cec19c..273072562f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/creditcard-payment-webapp/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Tours CreditCard Payment WebApp Contribution</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-corba/pom.xml
index 8ab8cff332..51496f3c5a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-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-contribution-currency-corba</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With CORBA Binding</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jms/pom.xml
index d2890508b2..7f97f84f33 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-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-contribution-currency-jms</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With JMS Binding</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jsp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jsp/pom.xml
index 91fc29c370..85a8c65cd3 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jsp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-jsp/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-contribution-currency-jsp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-rmi/pom.xml
index 0bd15a7895..b464ce2280 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-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-contribution-currency-rmi</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With RMI Binding</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-servlet/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-servlet/pom.xml
index cc4ba525a1..a01bc6f97e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-servlet/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-servlet/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-contribution-currency-servlet</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Tours Currency Converter Servlet Contribution</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-ws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-ws/pom.xml
index 4a50cd4f43..8862bfe37d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency-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-contribution-currency-ws</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With Web Service Binding</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency/pom.xml
index bd99e15850..cc08655d6e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/currency/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-contribution-currency</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/databinding-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/databinding-client/pom.xml
index 1ceea2b45d..fc57bd6eee 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/databinding-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/databinding-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-contribution-databinding-client</artifactId>
     <name>Apache Tuscany SCA Tours Databinding Client Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/emailgateway/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/emailgateway/pom.xml
index 789edbe475..8b564c8154 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/emailgateway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/emailgateway/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-emailgateway</artifactId>
     <name>Apache Tuscany SCA Tours Email Gateway Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/feed-logger/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/feed-logger/pom.xml
index 7f7db730bc..e8384d5aac 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/feed-logger/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/feed-logger/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-contribution-feed-logger</artifactId>
     <name>Apache Tuscany SCA Tours Feed Logger Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/flight/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/flight/pom.xml
index 53008cd555..2c4fecf1e4 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/flight/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/flight/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-contribution-flight</artifactId>
     <name>Apache Tuscany SCA Tours Flight Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-bespoketrip/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-bespoketrip/pom.xml
index 6563d6c782..aeedcfca35 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-bespoketrip/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-bespoketrip/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-contribution-fullapp-bespoketrip</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Bespoke Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-coordination/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-coordination/pom.xml
index 5ddadf2521..1a07b857be 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-coordination/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-coordination/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-contribution-fullapp-coordination</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-currency/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-currency/pom.xml
index 076018b274..ab8d24a8e6 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-currency/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-currency/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-contribution-fullapp-currency</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Currency Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-packagedtrip/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-packagedtrip/pom.xml
index a1aa8e7913..a80fdc2e31 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-packagedtrip/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-packagedtrip/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-contribution-fullapp-packagedtrip</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Packaged Trip Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-shoppingcart/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-shoppingcart/pom.xml
index f2f02a2143..5280430ca0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-shoppingcart/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-shoppingcart/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-contribution-fullapp-shoppingcart</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Shopping Cart Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-ui/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-ui/pom.xml
index d7acb41d94..d2a9c02b8e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-ui/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/fullapp-ui/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-contribution-fullapp-ui</artifactId>
     <name>Apache Tuscany SCA Tours Full Application User Interface Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/help-pages/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/help-pages/pom.xml
index 91360b9594..a21d3b5413 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/help-pages/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-help-pages</artifactId>
     <name>Apache Tuscany SCA Tours Help Pages Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/hotel/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/hotel/pom.xml
index 55b3bc193d..f74648919b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/hotel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/hotel/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-contribution-hotel</artifactId>
     <name>Apache Tuscany SCA Tours Hotel Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-client/pom.xml
index 59025a3a54..92ae0bfdae 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-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-contribution-interaction-client</artifactId>
     <name>Apache Tuscany SCA Tours Interaction Client Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-service-remote/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-service-remote/pom.xml
index 417557f0ae..da8e27dcc7 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-service-remote/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/interaction-service-remote/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-contribution-interaction-service-remote</artifactId>
     <name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-client/pom.xml
index efbfec8179..80c915b0b1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-introducing-client</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Client Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-tours/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-tours/pom.xml
index 90839f94d4..2e938a4c4a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-tours/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-introducing-tours</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Tours Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-trips/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-trips/pom.xml
index d586861b6b..c27e4f4ce2 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/introducing-trips/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-introducing-trips</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Trips Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-corba/pom.xml
index 2cc112c887..0125d959a7 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-notification-corba</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway CORBA Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ejb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ejb/pom.xml
index 4a51f1d27f..e33be5577c 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-notification-ejb</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway EJB Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-jms/pom.xml
index bd4740eec7..d38c858849 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-notification-jms</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway JMS Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-rmi/pom.xml
index ba86efbecf..d9e84c12df 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-notification-rmi</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway RMI Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ws/pom.xml
index 95dc266d38..1d232230c1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-notification-ws</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway Web Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification/pom.xml
index 0f4e682e24..388efea31f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/notification/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-contribution-notification</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel-process/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel-process/pom.xml
index 4bd900239c..c799164558 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel-process/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel-process/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-bpel-process</artifactId>
     <name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel/pom.xml
index 5ac4da779c..de3015bf80 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-bpel/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-bpel</artifactId>
     <name>Apache Tuscany SCA Tours Payment BPEL Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-groovy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-groovy/pom.xml
index 523e1a8c24..f4a51f4675 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-groovy/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-groovy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-callback/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-callback/pom.xml
index 2dc84e2b39..94b4bb07cf 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-callback/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-java-callback</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Callback</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-policy/pom.xml
index 69bf9229db..bc320b914a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-policy/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-java-policy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Policy Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-reference-pass/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-reference-pass/pom.xml
index a90061ffe9..63aefcc9f5 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-reference-pass/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java-reference-pass/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-java-reference-pass</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Reference Pass</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java/pom.xml
index 5e81879131..8a3f7d3333 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-java/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-java</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-python/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-python/pom.xml
index 93c63ed973..2eba181055 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-python/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-python/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-python</artifactId>
     <name>Apache Tuscany SCA Tours Payment Python Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-policy/pom.xml
index 92c169b68a..8b57479316 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-policy/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-spring-policy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring Policy Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-scatag/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-scatag/pom.xml
index f1ab200d64..15a954bc0b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-scatag/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring-scatag/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-spring-scatag</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring/pom.xml
index 4c963f4b99..a9d12e328c 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/payment-spring/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-spring</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/policy-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/policy-client/pom.xml
index b304838d47..ec27d155fd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/policy-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/policy-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-contribution-policy-client</artifactId>
     <name>Apache Tuscany SCA Tours Policy Client Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/pom.xml
index 212068d1f9..3471f56b3f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contributions</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours Contributions</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/scatours/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/scatours/pom.xml
index 8f291690df..bca0f0ee56 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/scatours/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/scatours/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-contribution-scatours</artifactId>
     <name>Apache Tuscany SCA Tours SCATours Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/shoppingcart/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/shoppingcart/pom.xml
index 30d317a90c..9b77ec6387 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/shoppingcart/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/shoppingcart/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-shoppingcart</artifactId>
     <name>Apache Tuscany SCA Tours Shopping Cart Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/travelcatalog/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/travelcatalog/pom.xml
index d2f8f1278c..fda71108e1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/travelcatalog/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/travelcatalog/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-contribution-travelcatalog</artifactId>
     <name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip-policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip-policy/pom.xml
index 2a235f887e..6c1f90f1c1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip-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-contribution-trip-policy</artifactId>
     <name>Apache Tuscany SCA Tours Prepackaged Trip Policy Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip/pom.xml
index 2cadc55c4e..a01007e93a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/trip/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-contribution-trip</artifactId>
     <name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/tripbooking/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/tripbooking/pom.xml
index 8527a8c7c3..1582b965cb 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/tripbooking/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/tripbooking/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-contribution-tripbooking</artifactId>
     <name>Apache Tuscany SCA Tours Trip Booking Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/pom.xml
index cb759ac7c9..1c9c2a0a33 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/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-contribution-usingsca</artifactId>
     <name>Apache Tuscany SCA Tours Using SCA Components Contribution</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
index b112773d31..d09c4d01b3 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
@@ -25,8 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
-
     <artifactId>scatours-distribution</artifactId>
     <name>Apache Tuscany SCA Tours Distribution</name>
     <packaging>pom</packaging>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
index 94802269bb..8ac5c0a7fc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/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-domainconfig-fullapp</artifactId>
     <name>Apache Tuscany SCA Tours Full App Domain Configuration</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
index 9cc529cd90..046a92980d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/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-domainconfig-introducing</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Domain Configuration</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/pom.xml
index 41f75d3068..48dba23351 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-domainconfig</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours Domain Configurations</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/pom.xml
index 5f36065a5b..b5e12d98de 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/buildingblocks/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/pom.xml
index b43706c55e..2cbf13c465 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/pom.xml
index 3f48c97f2a..d491e1032b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/pom.xml
index db54525784..7668bd8a62 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/pom.xml
index 14e4a77e3d..bc023c48a4 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/pom.xml
index bddb75987a..afe48b325f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/currency-converter/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/pom.xml
index 20cbc7dbff..323e0e6827 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/databinding/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/pom.xml
index 7fef1796f7..e5502ea5a0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/feed-logger/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/pom.xml
index fb5a788652..b3d82f42d0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/pom.xml
index eb7604506d..f8f0359040 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/fullapp-nodes/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-nodes/pom.xml
index 28f5e93074..7044caf3ee 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-nodes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/fullapp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/pom.xml
index 70bef29299..5719ba9520 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/help-pages/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/pom.xml
index b26030fb77..16ea9f9834 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/interaction/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/pom.xml
index 7e15913e53..3d9afcd726 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/introducing-client/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-client/pom.xml
index 7385505063..b86c99b63c 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/introducing-domain/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/pom.xml
index 43d256e212..fb2f48b447 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/introducing-tours/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-tours/pom.xml
index 5970149bc9..d18a670904 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-tours/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/introducing-trips/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-trips/pom.xml
index ec5da820e7..8d2ef26877 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-trips/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/introducing/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/pom.xml
index 98c8627d6c..36a5f9647b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/jumpstart/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/jumpstart/pom.xml
index c5f50cb8df..e70173619d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/jumpstart/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/notification-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/pom.xml
index 077e5e724f..643edc9445 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml
index 1dd95cf3e5..a70f7b2556 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/notification-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/pom.xml
index 3b20798e40..02a4b462b5 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/notification-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/pom.xml
index 69590fa45e..9ab98240d1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/notification-ws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/pom.xml
index c5dd336d6b..816006ea10 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-bpel/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/pom.xml
index 811bb6a9ed..4018c194ef 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-groovy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/pom.xml
index b46c58001c..0e351c2a78 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/pom.xml
index d4ea82f62c..70f97ed9b6 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/pom.xml
index 4d6823400c..e8a7c80c2b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/pom.xml
index 6046fcab91..33f8a8dd84 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-java/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/pom.xml
index 2a2bb63532..3276595fb3 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-python/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/pom.xml
index 97ba34d3ab..a5d9998d61 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/pom.xml
index c44f53ad1a..1730409c94 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/payment-spring/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/pom.xml
index 013c7e1482..d29b9680ed 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/policy/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/pom.xml
index dc72d0c3c0..43b8b706fd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml
index f3301b4793..8df7db17cc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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/branches/sca-java-travelsample-1.0/launchers/usingsca/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/pom.xml
index 66144b037c..3de04e9b36 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/pom.xml
index 8428d9a791..99df6669d1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-services</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours non-SCA Services</name>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-corba/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-corba/pom.xml
index 261c22d5e1..c1f756c20f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-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-service-smsgateway-corba</artifactId>
     <name>Apache Tuscany SCA Tours SMS Gateway CORBA Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/pom.xml
index 9be6e6647d..633b3db5a7 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-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-service-smsgateway-ejb</artifactId>
     <name>Apache Tuscany SCA Tours SMS Gateway EJB Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/pom.xml
index 06c497db00..ebd7afad63 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/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-service-smsgateway-jaxws</artifactId>
     <name>Apache Tuscany SCA Tours SMS Gateway JAX-WS Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jms/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jms/pom.xml
index 9b0bee5a6f..b90c5c30d2 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-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-service-smsgateway-jms</artifactId>
     <name>Apache Tuscany SCA Tours SMS Gateway JMS Service</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-rmi/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-rmi/pom.xml
index 1922ec271b..d8c8886645 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-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-service-smsgateway-rmi</artifactId>
     <name>Apache Tuscany SCA Tours SMS Gateway RMI Service</name>
     
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/testdomain/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/testdomain/pom.xml
index b30add6b13..8c0bdaa970 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/testdomain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/testdomain/pom.xml
@@ -23,8 +23,8 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
     <artifactId>scatours-test-domain</artifactId>
     <name>Apache Tuscany SCA Tours Test Domain</name>
     
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/jaxws-runtime/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/jaxws-runtime/pom.xml
index 7f02dc408e..d7ade4e120 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/jaxws-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/jaxws-runtime/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-util-jaxws-runtime</artifactId>
     <name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/launcher-common/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/launcher-common/pom.xml
index a499139eff..6a55e49f5f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/launcher-common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/launcher-common/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-util-launcher-common</artifactId>
     <name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/openejb-runtime/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/openejb-runtime/pom.xml
index b78fd646d6..6a1b13bf96 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/openejb-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/openejb-runtime/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-util-openejb-runtime</artifactId>
     <name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name>
 
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/pom.xml
index 7f987f9afd..36bdb3961f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/util/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/util/pom.xml
@@ -25,7 +25,6 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.0-SNAPSHOT</version>
     <artifactId>scatours-util</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours Utilities</name>