35 files changed, 101 insertions, 101 deletions
diff --git a/sca-java-1.x/trunk/tools/contrib2wsdl/pom.xml b/sca-java-1.x/trunk/tools/contrib2wsdl/pom.xml
index 4d388c1c2c..182a7f673e 100644
--- a/sca-java-1.x/trunk/tools/contrib2wsdl/pom.xml
+++ b/sca-java-1.x/trunk/tools/contrib2wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contrib2wsdl</artifactId>
@@ -31,37 +31,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/trunk/tools/databinding/sdo/pom.xml b/sca-java-1.x/trunk/tools/databinding/sdo/pom.xml
index bd28b81e04..88a9e7b931 100644
--- a/sca-java-1.x/trunk/tools/databinding/sdo/pom.xml
+++ b/sca-java-1.x/trunk/tools/databinding/sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>tuscany-sca-tools</artifactId>
         <groupId>org.apache.tuscany.sca</groupId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
index 8dfcc5c36b..7b43a015b2 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
@@ -60,12 +60,12 @@ Unless required by applicable law or agreed to in writing, software distributed
          unpack="false"/>
 
    <data
-         id="runtime/apache-tuscany-sca-1.6-SNAPSHOT.jar"
+         id="runtime/apache-tuscany-sca-1.7-SNAPSHOT.jar"
          download-size="0"
          install-size="0"/>
 
    <data
-         id="src/apache-tuscany-sca-1.6-SNAPSHOT-src.zip"
+         id="src/apache-tuscany-sca-1.7-SNAPSHOT-src.zip"
          download-size="0"
          install-size="0"/>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
index 95e1b8039f..823ad07698 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
index 48c3be12c8..7fe3b8cee7 100644
--- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.core</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse/pom.xml b/sca-java-1.x/trunk/tools/eclipse/pom.xml
index 4f5e2dc7b6..684e4e0e05 100644
--- a/sca-java-1.x/trunk/tools/eclipse/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
index 45c021aa82..50c5edc04d 100644
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
index 9d83433882..55e393d60e 100644
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
@@ -23,14 +23,14 @@
    </description>
    
    <feature id="org.apache.tuscany.sca.feature.core" version="1.5.1"
-      url="features/org.apache.tuscany.sca.feature.core-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.core-1.7-SNAPSHOT.jar"/>
    
    <archive path="plugins/org.apache.tuscany.sca.core_1.5.1.jar"
-      url="plugins/org.apache.tuscany.sca.core-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.core-1.7-SNAPSHOT.jar"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/runtime/apache-tuscany-sca-1.6-SNAPSHOT.jar"
-      url="../apache-tuscany-sca-1.6-SNAPSHOT.zip"/>
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/runtime/apache-tuscany-sca-1.7-SNAPSHOT.jar"
+      url="../apache-tuscany-sca-1.7-SNAPSHOT.zip"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/src/apache-tuscany-sca-1.6-SNAPSHOT-src.zip"
-      url="../apache-tuscany-sca-1.6-SNAPSHOT-src.zip"/>   
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/src/apache-tuscany-sca-1.7-SNAPSHOT-src.zip"
+      url="../apache-tuscany-sca-1.7-SNAPSHOT-src.zip"/>   
 </site>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/core/pom.xml
index ccce95de05..a2a3772101 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/ejava/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/ejava/pom.xml
index 0d42beba16..c6ad6baf4a 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/ejava/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/manager/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/manager/pom.xml
index 9731166cf6..8a1aa18e3b 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/manager/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/process/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/process/pom.xml
index 6515b0958e..70e68f8058 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/process/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/process/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.process</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/web20/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/web20/pom.xml
index e64700d106..85e088d4a1 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/web20/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/web20/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/features/webservice/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/features/webservice/pom.xml
index 2caaef89d4..33e71f1f6c 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/features/webservice/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/features/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/core/pom.xml
index 3fa51063e4..223330ad2b 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
@@ -44,14 +44,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/ejava/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/ejava/pom.xml
index 7604fc516a..faedc5cb32 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/ejava/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/manager/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/manager/pom.xml
index c6db3d21b2..eede4479d6 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/manager/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/process/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/process/pom.xml
index f1edd8a706..c3457dbca5 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/process/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/process/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/web20/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/web20/pom.xml
index 2e643a4064..a6efcfe2ce 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/web20/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/web20/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/plugins/webservice/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/plugins/webservice/pom.xml
index 24f03f7274..00b620bc34 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/plugins/webservice/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/plugins/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <classifier>src</classifier>
             <type>zip</type>
         </dependency>
diff --git a/sca-java-1.x/trunk/tools/eclipse34/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/pom.xml
index 025b57cbc1..8761298289 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/pom.xml b/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/pom.xml
index b96902df2f..0e2bf30798 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
@@ -36,72 +36,72 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.process</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/site.xml b/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/site.xml
index 1496bdc2c8..77b262c4ce 100644
--- a/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/site.xml
+++ b/sca-java-1.x/trunk/tools/eclipse34/site/updatesite/site.xml
@@ -22,65 +22,65 @@
       Apache Tuscany SCA Eclipse Update Site.
    </description>
    
-   <feature url="features/org.apache.tuscany.sca.feature.core-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.core-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.core" version="1.4.0">
       <category name="org.apache.tuscany.sca.core.features"/>
    </feature>
    
-   <feature url="features/org.apache.tuscany.sca.feature.ejava-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.ejava-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.ejava" version="1.4.0">
       <category name="org.apache.tuscany.sca.optional.features"/>
    </feature>
    
-   <feature url="features/org.apache.tuscany.sca.feature.manager-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.manager-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.manager" version="1.4.0">
       <category name="org.apache.tuscany.sca.core.features"/>
    </feature>
    
-   <feature url="features/org.apache.tuscany.sca.feature.process-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.process-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.process" version="1.4.0">
       <category name="org.apache.tuscany.sca.optional.features"/>
    </feature>
    
-   <feature url="features/org.apache.tuscany.sca.feature.web20-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.web20-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.web20" version="1.4.0">
       <category name="org.apache.tuscany.sca.optional.features"/>
    </feature>
    
-   <feature url="features/org.apache.tuscany.sca.feature.webservice-1.6-SNAPSHOT.jar"
+   <feature url="features/org.apache.tuscany.sca.feature.webservice-1.7-SNAPSHOT.jar"
       id="org.apache.tuscany.sca.feature.webservice" version="1.4.0">
       <category name="org.apache.tuscany.sca.optional.features"/>
    </feature>
    
    <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.core-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.core-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.core_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.core-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.core-1.7-SNAPSHOT.jar"/>
       
    <archive path="features/org.apache.tuscany.sca.feature.ejava_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.ejava-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.ejava-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.ejava_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.ejava-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.ejava-1.7-SNAPSHOT.jar"/>
       
    <archive path="features/org.apache.tuscany.sca.feature.manager_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.manager-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.manager-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.manager_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.manager-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.manager-1.7-SNAPSHOT.jar"/>
       
    <archive path="features/org.apache.tuscany.sca.feature.process_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.process-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.process-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.process_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.process-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.process-1.7-SNAPSHOT.jar"/>
       
    <archive path="features/org.apache.tuscany.sca.feature.web20_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.web20-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.web20-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.web20_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.web20-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.web20-1.7-SNAPSHOT.jar"/>
 
    <archive path="features/org.apache.tuscany.sca.feature.webservice_1.4.0.jar"
-      url="features/org.apache.tuscany.sca.feature.webservice-1.6-SNAPSHOT.jar"/>
+      url="features/org.apache.tuscany.sca.feature.webservice-1.7-SNAPSHOT.jar"/>
    <archive path="plugins/org.apache.tuscany.sca.plugin.webservice_1.4.0.jar"
-      url="plugins/org.apache.tuscany.sca.plugin.webservice-1.6-SNAPSHOT.jar"/>
+      url="plugins/org.apache.tuscany.sca.plugin.webservice-1.7-SNAPSHOT.jar"/>
 
    <category-def name="org.apache.tuscany.sca.core.features"
       label="Core Features"/>
diff --git a/sca-java-1.x/trunk/tools/java2wsdl/pom.xml b/sca-java-1.x/trunk/tools/java2wsdl/pom.xml
index 0f2d66df1b..d00ecdf3f1 100644
--- a/sca-java-1.x/trunk/tools/java2wsdl/pom.xml
+++ b/sca-java-1.x/trunk/tools/java2wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-java2wsdl</artifactId>
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.stream</groupId>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-ant-generator/pom.xml
index 6d40bb02c6..eb8552b13d 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-ant-generator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-ant-generator</artifactId>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-dependency-lister/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-dependency-lister/pom.xml
index f5bafa86f7..6154fc7a9c 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-dependency-lister/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-dependency-lister/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-dependency-lister</artifactId>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-incremental-build/pom.xml
index 1553f3ff27..b7bf19adc3 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-incremental-build/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-incremental-build</artifactId>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-java2wsdl/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-java2wsdl/pom.xml
index cd04449c3b..965014c685 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-java2wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-java2wsdl</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-java2wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-osgi-junit/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-osgi-junit/pom.xml
index 70c0ea0c5e..bc2d1ea5d3 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-osgi-junit/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-osgi-junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-osgi-junit</artifactId>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-tuscany-bundle-plugin/pom.xml
index e693691399..f8c938cb20 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-tuscany-bundle-plugin/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-tuscany-bundle-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-bundle-plugin</artifactId>
diff --git a/sca-java-1.x/trunk/tools/maven/maven-wsdl2java/pom.xml b/sca-java-1.x/trunk/tools/maven/maven-wsdl2java/pom.xml
index 580b3214dd..4ce7d27542 100644
--- a/sca-java-1.x/trunk/tools/maven/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/maven-wsdl2java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-wsdl2java</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-1.x/trunk/tools/maven/pom.xml b/sca-java-1.x/trunk/tools/maven/pom.xml
index 077a486d06..daa25baca7 100644
--- a/sca-java-1.x/trunk/tools/maven/pom.xml
+++ b/sca-java-1.x/trunk/tools/maven/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/trunk/tools/pom.xml b/sca-java-1.x/trunk/tools/pom.xml
index 77b35a11d6..a3b4e9a196 100644
--- a/sca-java-1.x/trunk/tools/pom.xml
+++ b/sca-java-1.x/trunk/tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-sca-tools</artifactId>
diff --git a/sca-java-1.x/trunk/tools/wsdl2java-cxf/pom.xml b/sca-java-1.x/trunk/tools/wsdl2java-cxf/pom.xml
index 1a759ec17f..7b8b9acf3e 100644
--- a/sca-java-1.x/trunk/tools/wsdl2java-cxf/pom.xml
+++ b/sca-java-1.x/trunk/tools/wsdl2java-cxf/pom.xml
@@ -22,7 +22,7 @@
  <parent>
     <artifactId>tuscany-sca-tools</artifactId>
     <groupId>org.apache.tuscany.sca</groupId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
   </parent>
  
   <artifactId>tuscany-tools-wsdl2java-cxf</artifactId>
diff --git a/sca-java-1.x/trunk/tools/wsdl2java/pom.xml b/sca-java-1.x/trunk/tools/wsdl2java/pom.xml
index 42bf0c7162..e0f4b069db 100644
--- a/sca-java-1.x/trunk/tools/wsdl2java/pom.xml
+++ b/sca-java-1.x/trunk/tools/wsdl2java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-wsdl2java</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>