Update version number to 1.6.1-SNAPSHOT

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

483 files changed, 3638 insertions, 3638 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/pom.xml
index 1813ae1e9a..1cb10c7eb0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/pom.xml
@@ -24,14 +24,14 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>demo-alert-aggregator-webapp</artifactId>
     <packaging>war</packaging>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <name>Apache Tuscany SCA Demo Alert Aggregator</name>
     <url>http://cwiki.apache.org/TUSCANY</url>
 
@@ -120,24 +120,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
@@ -330,7 +330,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 95c79ab2e7..032f5a7478 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -23,7 +23,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>demo-alert-aggregator-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-2622 -->
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/build.xml
index bc10c32532..80d8a678b7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/build.xml
@@ -23,9 +23,9 @@
     
     <!--path id="test.classpath">
     	<pathelement location="target/classes"/>
-        <pathelement location="../../modules/tuscany-host-jetty-1.6-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-rmi-1.6-SNAPSHOT.jar"/>
+        <pathelement location="../../modules/tuscany-host-jetty-1.6.1-SNAPSHOT.jar"/>
+        <pathelement location="../../modules/tuscany-binding-jsonrpc-1.6.1-SNAPSHOT.jar"/>
+        <pathelement location="../../modules/tuscany-binding-rmi-1.6.1-SNAPSHOT.jar"/>
     	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
     	<pathelement location="target/demo-bigbank-account.jar"/>    
     </path-->
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/pom.xml
index 4da7161d1d..006a3f04e0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-account/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-bigbank-account</artifactId>
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/build.xml
index 037e5b778f..a4ad9a598f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/build.xml
@@ -20,7 +20,7 @@
     <property name="test.class" value="calculator.demo.CalculatorServer" />
 	
     <path id="test.classpath">
-        <!-- pathelement location="../../modules/tuscany-binding-rmi-1.6-SNAPSHOT.jar"/-->
+        <!-- pathelement location="../../modules/tuscany-binding-rmi-1.6.1-SNAPSHOT.jar"/-->
         <pathelement path="target/demo-bigbank-calculator.jar"/>      
     	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
     </path>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/pom.xml
index 7f7f172e24..0864ad3745 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-bigbank-calculator</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-stockquote/pom.xml
index fa9e896c10..b46c24418d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-stockquote/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank-stockquote/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-bigbank-stockquote</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank/pom.xml
index 78781eeacf..9348df9345 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-bigbank</artifactId>
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -58,69 +58,69 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>demo-bigbank-account</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-creditcheck/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-creditcheck/pom.xml
index bb47766835..5cc96ac9e4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-creditcheck/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-creditcheck/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-mortgage-creditcheck</artifactId>
@@ -34,27 +34,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-loanapproval/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-loanapproval/pom.xml
index fd3e46c011..e54f3dc8dc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-loanapproval/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/mortgage-loanapproval/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-mortgage-loanapproval</artifactId>
@@ -31,33 +31,33 @@
     <description>A sample Mortgage application made of several SCA components wired together.</description>
 
     <properties>
-        <property name="tuscanyVersion">1.6-SNAPSHOT</property>
+        <property name="tuscanyVersion">1.6.1-SNAPSHOT</property>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/pom.xml
index b6313c46c7..73aaa3b330 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-demos</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/demos/xml-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/demos/xml-bigbank/pom.xml
index a47dc0f0fe..3435206b2c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/demos/xml-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/demos/xml-bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-xml-bigbank</artifactId>
@@ -34,34 +34,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -69,14 +69,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
index 19ef26d822..c18e95ee2f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
index 8a5da0b9c0..70aaaf5062 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml
index ebd005082b..e85611b07f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
         <!--include tomcat here so it is shipped in modules/ but not  -->
@@ -108,7 +108,7 @@
         <!-- dependency> 
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency -->
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
index 44e6d8dc30..5993835365 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-atom</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/client/pom.xml
index f71d028291..9fede1c210 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>itest-binidng-sca-jms</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-binding-sca-jms-client</artifactId>

@@ -31,20 +31,20 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/pom.xml
index 96f7eb6ff2..5d9d584505 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-binidng-sca-jms</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/service/pom.xml
index 64480b4163..5b38d37fbf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/binding-sca-jms/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>itest-binidng-sca-jms</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-binding-sca-jms-service</artifactId>

@@ -31,20 +31,20 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-reference/pom.xml
index 7f36ef03f4..cf612438e1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel-helloworld-reference</artifactId>
@@ -39,34 +39,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -187,7 +187,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.6.1-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-ws/pom.xml
index 6b241ea748..be2a7a295f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel-helloworld-ws</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 		
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 				        
@@ -154,7 +154,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.6.1-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld/pom.xml
index 638c0a3cb9..20018d841b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel-helloworld</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -140,7 +140,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.6.1-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/pom.xml
index 85b0f79737..20a8d9500e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/builder/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/builder/pom.xml
index a2ab7226b7..5d041bbe05 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/builder/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-builder</artifactId>

@@ -32,55 +32,55 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-monitor</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-workspace-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

         

         <dependency>

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

             <artifactId>tuscany-binding-ws-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>  

         

         <dependency>

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

             <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>  

         

         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences-ws/pom.xml
index 6e4f8d1070..7a6e06a374 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-callablereferences-ws</artifactId>

@@ -32,27 +32,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences/pom.xml
index 7b4e3ee6f8..572efe0fb7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callablereferences/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callablereferences</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -52,14 +52,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
 -->        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
@@ -67,14 +67,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-api/pom.xml
index 001d1a0fd4..8646af3155 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-api</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-basic/pom.xml
index 2f207b264f..22808bb9d6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-basic</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-complex-type/pom.xml
index d88c594b1a..65528743b3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-complex-type</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-composite-scope/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-composite-scope/pom.xml
index 73122234ae..91ccdde486 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-composite-scope/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-composite-scope/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-composite-scope</artifactId>
@@ -35,13 +35,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-id/pom.xml
index 7899562aa3..949d1c64f9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-id/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-id/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-id</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-multiple-wires/pom.xml
index b9da775638..08ee27bc33 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-multiple-wires</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-separatethread/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-separatethread/pom.xml
index 71e5b38736..2159aeb75a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-separatethread/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-separatethread</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-callback/pom.xml
index 2968f8938c..fe12e10c7e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-callback</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-conversation/pom.xml
index e08231f266..82511b446d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/callback-set-conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-conversation</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/component-type/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/component-type/pom.xml
index 053eec830e..a94a26fb4a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/component-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-component-type</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-classes/pom.xml
index c709557967..5b4b9f4137 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-classes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-classloader-classes</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-test/pom.xml
index ff2d0d3633..f161a82aa2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/contribution-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-classloader-test</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/pom.xml
index 2708a74229..cf496627b9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-classloader/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-classloader</artifactId>
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-folder/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-folder/pom.xml
index 783288eea8..f3e8ef4505 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-folder/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-folder/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-folder</artifactId>

@@ -32,19 +32,19 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-composite/pom.xml
index 38e37a7080..767ef38649 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-export-composite</artifactId>

@@ -32,27 +32,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-java/pom.xml
index 4f361a12f5..366c627341 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-export-java</artifactId>

@@ -32,27 +32,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..f0f7bb68bd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-export-resource</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-wsdl/pom.xml
index 9f81cd92ca..28826f335f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/export-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-export-wsdl</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-composite/pom.xml
index d13f2e2a87..42050c5ac6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-import-composite</artifactId>

@@ -32,33 +32,33 @@
         <dependency>

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

             <artifactId>itest-contribution-export-composite</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-java/pom.xml
index f05c62f8ca..c85d596110 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-import-java</artifactId>

@@ -32,33 +32,33 @@
         <dependency>

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

             <artifactId>itest-contribution-export-java</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-resource/pom.xml
index 0696df1951..bf1adc8c8d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-import-resource</artifactId>
@@ -33,47 +33,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-export-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-wsdl/pom.xml
index 59bee4125e..2ed2ddd202 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/import-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-import-wsdl</artifactId>

@@ -32,33 +32,33 @@
         <dependency>

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

             <artifactId>itest-contribution-export-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/pom.xml
index ff6a4bbf12..0de20401f6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-import-export/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution-import-export</artifactId>

@@ -44,13 +44,13 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
index 74687aedbf..fbde9f3645 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
index 32aa604cba..d0c47d0ef6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-00-jar-shared</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
index 57054b4a5d..9ca2a2868e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
index e7ea217b2a..71e650bc22 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
index 1bf1c63799..bc223af548 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
index 44a0b85dc2..49c66c7c36 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
index 29690543e8..8f4fb64b40 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml
index f32ff8f6ab..2ba4ee93f2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/jar-shared/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml
index a1a80f047c..73e950290a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml
index 15eaa7f3f3..2c0a2379f5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/sample-11-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
index 7852f46dd3..01e8b1557d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
index 306b27fd5c..0da7e82f96 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
index d13e11262c..6da9fdd8a3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
index 258e7c73d1..148c9ef8db 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-44-scajar-ejb-nonenhanced</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
index 417a97c087..6b9e11e582 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-10-scazip-ejb-appcomp</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
         </dependency>   
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
index 5965b2aaa8..6dd07c8c23 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee-samples-04-scazip-war-appcomp</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
         </dependency>  
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
index 4129a0702b..66326b858b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
index 26f996bd6a..23f4b82c11 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-contribution-jee-samples</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee/pom.xml
index 05076abb79..06d76a1fc4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-jee</artifactId>
@@ -32,62 +32,62 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jee</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
@@ -119,70 +119,70 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>war</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ejb</type>
         </dependency>       
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-13-ear-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ear</type>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>ear</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>jar</type>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-contribution-jee-samples-44-scajar-ejb-nonenhanced</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <type>jar</type>
         </dependency>        
                         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-multiple/pom.xml
index b5c6cafcca..0f4926d130 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution-multiple/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-multiple</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution/pom.xml
index 40a24c3e83..c8aa6cc528 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-contribution</artifactId>

@@ -32,20 +32,20 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations-ws/pom.xml
index 91c26b447b..139d949078 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-conversations-ws</artifactId>

@@ -34,26 +34,26 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations/pom.xml
index 7240bfe6df..ec4596ba81 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/conversations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-conversations</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/corba/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/corba/pom.xml
index 6079e77a2d..2216ee488c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/corba/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-corba-binding</artifactId>
@@ -32,48 +32,48 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca-corba</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -98,14 +98,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/common/pom.xml
index d45eaeddb5..7beed4144f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/common/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-common</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest Databinding Common</name>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/interop/pom.xml
index ee1f149b12..15ef91a65b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/interop/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-interop</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest DataBinding Interop</name>
 
@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/pom.xml
index 9129858675..923b9cd96c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
 
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/pom.xml
index ab92c9c382..1f46eae98f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-top-down</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
 
@@ -63,60 +63,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-databindings-common</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency-->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxbgen/pom.xml
index e8152fed41..f6f5c34f75 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxbgen/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest JAXB Databinding</name>
 
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/pom.xml
index c76ca19be2..c88354e7ad 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/pom.xml
@@ -21,7 +21,7 @@
   <parent>
       <groupId>org.apache.tuscany.sca</groupId>
       <artifactId>tuscany-itest</artifactId>
-      <version>1.6-SNAPSHOT</version>
+      <version>1.6.1-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
   <groupId>org.apache.tuscany.sca</groupId>
   <artifactId>itest-databindings</artifactId>
   <name>Apache Tuscany SCA Databindings Integration Tests</name>
-  <version>1.6-SNAPSHOT</version>
+  <version>1.6.1-SNAPSHOT</version>
   
   
   <packaging>pom</packaging>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/sdogen/pom.xml
index c9d70c5c83..34a6172f8b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/sdogen/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-sdo</artifactId>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA iTest SDO Databinding</name>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/pom.xml
index 8d451eed5b..a1e108d7cb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-distro-license-check</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-distribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <type>zip</type>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
index 5b74c5584e..a8c515e2f1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
@@ -40,7 +40,7 @@ public class LicenseTestCase extends TestCase {
     

     public void testCreateComponent() throws ZipException, IOException {

 

-        File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.6-SNAPSHOT.zip");

+        File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.6.1-SNAPSHOT.zip");

         ZipFile zf = new ZipFile(archive);

         try {

 

@@ -121,7 +121,7 @@ public class LicenseTestCase extends TestCase {
     }

 

     private String getLicenseText(ZipFile zf) throws IOException {

-        ZipEntry ze = zf.getEntry("tuscany-sca-1.6-SNAPSHOT/LICENSE");

+        ZipEntry ze = zf.getEntry("tuscany-sca-1.6.1-SNAPSHOT/LICENSE");

         InputStream in = zf.getInputStream(ze);

         String l = readLICENSE(in);

         return l;

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domain/pom.xml
index f03c291a70..60b07774a7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-domain</artifactId>

@@ -33,39 +33,39 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>    

         

         <dependency>

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

             <artifactId>tuscany-node-launcher</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>    

         

         <dependency>

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

             <artifactId>tuscany-workspace-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency> 

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-binding-sca</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>                                        

         

         <dependency>

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

             <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

         

@@ -79,14 +79,14 @@
         <dependency>

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

             <artifactId>tuscany-monitor</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>            

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>   

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/client/pom.xml
index 9ab69d4f2e..d865145aef 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>itest-domainmgr-basic</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-domainmgr-basic-client</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>itest-domainmgr-basic-tours</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/pom.xml
index 2fb6833539..9a691332fb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-basic</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Basic</name>
-
-    <packaging>pom</packaging>
-    <build>
-        <defaultGoal>install</defaultGoal>
-    </build>
-    <modules>
-        <module>trips</module>
-        <module>tours</module>
-        <module>client</module>
-        <module>runtest</module>
-    </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-basic</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Basic</name>

+

+    <packaging>pom</packaging>

+    <build>

+        <defaultGoal>install</defaultGoal>

+    </build>

+    <modules>

+        <module>trips</module>

+        <module>tours</module>

+        <module>client</module>

+        <module>runtest</module>

+    </modules>

+

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/runtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/runtest/pom.xml
index ac74736e30..4eb8d8073e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/runtest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/runtest/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-basic</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-basic-runtest</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Basic Run Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-basic-trips</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-basic-tours</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-basic-client</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                    </includes>
-                    <reportFormat>brief</reportFormat>
-                    <useFile>false</useFile>
-                    <forkMode>once</forkMode>
-                    <argLine>-ea -Xmx256m</argLine>
-                    <useSystemClassLoader>true</useSystemClassLoader>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-basic</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-basic-runtest</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Basic Run Test</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>itest-domainmgr-basic-trips</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>itest-domainmgr-basic-tours</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>itest-domainmgr-basic-client</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-domain-manager</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency> 

+        

+        <dependency>

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

+            <artifactId>tuscany-binding-sca-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>2.3.1</version>

+                <configuration>

+                    <includes>

+                        <include>**/*TestCase.java</include>

+                    </includes>

+                    <reportFormat>brief</reportFormat>

+                    <useFile>false</useFile>

+                    <forkMode>once</forkMode>

+                    <argLine>-ea -Xmx256m</argLine>

+                    <useSystemClassLoader>true</useSystemClassLoader>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/tours/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/tours/pom.xml
index 32017331a4..8477b8eae2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/tours/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/tours/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>itest-domainmgr-basic</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-domainmgr-basic-tours</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/trips/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/trips/pom.xml
index a623473e49..3eb0400dca 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/trips/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/basic/trips/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>itest-domainmgr-basic</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-domainmgr-basic-trips</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/client/pom.xml
index fcb7ff0392..dccba3b9e1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/client/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-callback</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-callback-client</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Callback Client</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-callback</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-callback-client</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Callback Client</name>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/pom.xml
index 9443ef1d81..f8532fedde 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/pom.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-callback</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Callback</name>
-
-    <packaging>pom</packaging>
-    <build>
-        <defaultGoal>install</defaultGoal>
-    </build>
-    <modules>
-        <module>service</module>
-        <module>client</module>
-        <module>runtest</module>
-    </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-callback</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Callback</name>

+

+    <packaging>pom</packaging>

+    <build>

+        <defaultGoal>install</defaultGoal>

+    </build>

+    <modules>

+        <module>service</module>

+        <module>client</module>

+        <module>runtest</module>

+    </modules>

+

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/runtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/runtest/pom.xml
index 6a5416097b..83d2c19d97 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/runtest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/runtest/pom.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-callback</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-callback-runtest</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Callback Run Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-callback-service</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-callback-client</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                    </includes>
-                    <reportFormat>brief</reportFormat>
-                    <useFile>false</useFile>
-                    <forkMode>once</forkMode>
-                    <argLine>-ea -Xmx256m</argLine>
-                    <useSystemClassLoader>true</useSystemClassLoader>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-callback</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-callback-runtest</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Callback Run Test</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>itest-domainmgr-callback-service</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>itest-domainmgr-callback-client</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-domain-manager</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency> 

+        

+        <dependency>

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

+            <artifactId>tuscany-binding-sca-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>2.3.1</version>

+                <configuration>

+                    <includes>

+                        <include>**/*TestCase.java</include>

+                    </includes>

+                    <reportFormat>brief</reportFormat>

+                    <useFile>false</useFile>

+                    <forkMode>once</forkMode>

+                    <argLine>-ea -Xmx256m</argLine>

+                    <useSystemClassLoader>true</useSystemClassLoader>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/service/pom.xml
index b53efde061..50a4b2ab65 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/callback/service/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-callback</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-callback-service</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Callback Service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-callback</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-callback-service</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Callback Service</name>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
index 31feaa127a..176e680151 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
@@ -1,198 +1,198 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-error</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-error-payment</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Payment</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>                
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-error</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-error-payment</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Payment</name>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.annotation</groupId>

+            <artifactId>jsr250-api</artifactId>

+            <version>1.0</version>

+        </dependency>    

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-security</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-transaction</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.bind</groupId>

+            <artifactId>jaxb-api</artifactId>

+            <version>2.1</version>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.ws</groupId>

+            <artifactId>jaxws-api</artifactId>

+            <version>2.1</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>javax.xml.soap</groupId>

+                    <artifactId>saaj-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-dependency-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>copy</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>copy</goal>

+                        </goals>

+                        <configuration>

+                            <artifactItems>

+                                <artifactItem>

+                                    <groupId>javax.xml.ws</groupId>

+                                    <artifactId>jaxws-api</artifactId>

+                                    <version>2.1</version>

+                                    <type>jar</type>

+                                </artifactItem>

+                                <artifactItem>

+                                    <groupId>javax.xml.bind</groupId>

+                                    <artifactId>jaxb-api</artifactId>

+                                    <version>2.1</version>

+                                    <type>jar</type>

+                                </artifactItem>

+                            </artifactItems>

+                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>

+                            <overWriteReleases>false</overWriteReleases>

+                            <overWriteSnapshots>true</overWriteSnapshots>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <configuration>

+                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>

+                </configuration>

+            </plugin>                

+            <plugin>

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

+                <artifactId>build-helper-maven-plugin</artifactId>

+                <version>1.0</version>

+                <executions>

+                    <execution>

+                        <id>add-source</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>add-source</goal>

+                        </goals>

+                        <configuration>

+                            <sources>

+                                <source>target/jaxws-source</source>

+                            </sources>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+            <plugin>

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

+                <artifactId>jaxws-maven-plugin</artifactId>

+                <version>1.12</version>

+                <executions>

+                    <execution>

+                        <id>payment</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>wsimport</goal>

+                        </goals>

+                        <configuration>

+                            <packageName>payment</packageName>

+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>

+                            <wsdlFiles>

+                                <wsdlFile>Payment.wsdl</wsdlFile>

+                            </wsdlFiles>

+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>

+                            <verbose>false</verbose>

+                            <xnocompile>true</xnocompile>

+                        </configuration>

+                    </execution>

+                    <execution>

+                        <id>payment.creditcard</id>

+                        <phase>process-sources</phase>

+                        <goals>

+                            <goal>wsimport</goal>

+                        </goals>

+                        <configuration>

+                            <packageName>payment.creditcard</packageName>

+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>

+                            <wsdlFiles>

+                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>

+                            </wsdlFiles>

+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

+                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>

+                            <verbose>false</verbose>

+                            <xnocompile>true</xnocompile>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/pom.xml
index 5ff39c4289..4a8fa1a147 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/pom.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-error</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name>
-
-    <packaging>pom</packaging>
-    <build>
-        <defaultGoal>install</defaultGoal>
-    </build>
-    <modules>
-        <module>payment</module>
-        <module>runtest</module>
-    </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-error</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name>

+

+    <packaging>pom</packaging>

+    <build>

+        <defaultGoal>install</defaultGoal>

+    </build>

+    <modules>

+        <module>payment</module>

+        <module>runtest</module>

+    </modules>

+

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/runtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/runtest/pom.xml
index 2097f2206c..09219587f2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/runtest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/runtest/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-error</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-error-runtest</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Run Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-error-payment</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                    </includes>
-                    <reportFormat>brief</reportFormat>
-                    <useFile>false</useFile>
-                    <forkMode>once</forkMode>
-                    <argLine>-ea -Xmx256m</argLine>
-                    <useSystemClassLoader>true</useSystemClassLoader>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-error</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-error-runtest</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Error Handling Run Test</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>itest-domainmgr-error-payment</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-security</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-transaction</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-domain-manager</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency> 

+        

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>2.3.1</version>

+                <configuration>

+                    <includes>

+                        <include>**/*TestCase.java</include>

+                    </includes>

+                    <reportFormat>brief</reportFormat>

+                    <useFile>false</useFile>

+                    <forkMode>once</forkMode>

+                    <argLine>-ea -Xmx256m</argLine>

+                    <useSystemClassLoader>true</useSystemClassLoader>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/pom.xml
index 4f8be528bb..cb97012c68 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/pom.xml
@@ -21,7 +21,7 @@
   <parent>

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

       <artifactId>tuscany-itest</artifactId>

-      <version>1.6-SNAPSHOT</version>

+      <version>1.6.1-SNAPSHOT</version>

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

   </parent>

   <modelVersion>4.0.0</modelVersion>

@@ -29,7 +29,7 @@
   <groupId>org.apache.tuscany.sca</groupId>

   <artifactId>itest-domainmgr</artifactId>

   <name>Apache Tuscany Domain Manager Integration Tests</name>

-  <version>1.6-SNAPSHOT</version>

+  <version>1.6.1-SNAPSHOT</version>

 

   <packaging>pom</packaging>

   <build>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
index 7dea2b9fa5..79566bb143 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
@@ -1,198 +1,198 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-transaction</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-transaction-payment</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Transaction Payment</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>        
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-transaction</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-transaction-payment</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Transaction Payment</name>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.annotation</groupId>

+            <artifactId>jsr250-api</artifactId>

+            <version>1.0</version>

+        </dependency>    

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-security</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-transaction</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.bind</groupId>

+            <artifactId>jaxb-api</artifactId>

+            <version>2.1</version>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.ws</groupId>

+            <artifactId>jaxws-api</artifactId>

+            <version>2.1</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>javax.xml.soap</groupId>

+                    <artifactId>saaj-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-dependency-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>copy</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>copy</goal>

+                        </goals>

+                        <configuration>

+                            <artifactItems>

+                                <artifactItem>

+                                    <groupId>javax.xml.ws</groupId>

+                                    <artifactId>jaxws-api</artifactId>

+                                    <version>2.1</version>

+                                    <type>jar</type>

+                                </artifactItem>

+                                <artifactItem>

+                                    <groupId>javax.xml.bind</groupId>

+                                    <artifactId>jaxb-api</artifactId>

+                                    <version>2.1</version>

+                                    <type>jar</type>

+                                </artifactItem>

+                            </artifactItems>

+                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>

+                            <overWriteReleases>false</overWriteReleases>

+                            <overWriteSnapshots>true</overWriteSnapshots>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <configuration>

+                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>

+                </configuration>

+            </plugin>        

+            <plugin>

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

+                <artifactId>build-helper-maven-plugin</artifactId>

+                <version>1.0</version>

+                <executions>

+                    <execution>

+                        <id>add-source</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>add-source</goal>

+                        </goals>

+                        <configuration>

+                            <sources>

+                                <source>target/jaxws-source</source>

+                            </sources>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+            <plugin>

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

+                <artifactId>jaxws-maven-plugin</artifactId>

+                <version>1.12</version>

+                <executions>

+                    <execution>

+                        <id>payment</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>wsimport</goal>

+                        </goals>

+                        <configuration>

+                            <packageName>payment</packageName>

+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>

+                            <wsdlFiles>

+                                <wsdlFile>Payment.wsdl</wsdlFile>

+                            </wsdlFiles>

+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>

+                            <verbose>false</verbose>

+                            <xnocompile>true</xnocompile>

+                        </configuration>

+                    </execution>

+                    <execution>

+                        <id>payment.creditcard</id>

+                        <phase>process-sources</phase>

+                        <goals>

+                            <goal>wsimport</goal>

+                        </goals>

+                        <configuration>

+                            <packageName>payment.creditcard</packageName>

+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>

+                            <wsdlFiles>

+                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>

+                            </wsdlFiles>

+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

+                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>

+                            <verbose>false</verbose>

+                            <xnocompile>true</xnocompile>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/pom.xml
index 067ec7e3d8..b7f93123af 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/pom.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-transaction</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Transaction</name>
-
-    <packaging>pom</packaging>
-    <build>
-        <defaultGoal>install</defaultGoal>
-    </build>
-    <modules>
-        <module>payment</module>
-        <module>runtest</module>
-    </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-transaction</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Transaction</name>

+

+    <packaging>pom</packaging>

+    <build>

+        <defaultGoal>install</defaultGoal>

+    </build>

+    <modules>

+        <module>payment</module>

+        <module>runtest</module>

+    </modules>

+

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/runtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/runtest/pom.xml
index 4a8ec3ac26..c2d95cc250 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/runtest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/runtest/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-domainmgr-transaction</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-transaction-runtest</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-domainmgr-transaction-payment</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                    </includes>
-                    <reportFormat>brief</reportFormat>
-                    <useFile>false</useFile>
-                    <forkMode>once</forkMode>
-                    <argLine>-ea -Xmx256m</argLine>
-                    <useSystemClassLoader>true</useSystemClassLoader>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>itest-domainmgr-transaction</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>itest-domainmgr-transaction-runtest</artifactId>

+    <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>itest-domainmgr-transaction-payment</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>provided</scope>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-security</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy-transaction</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-domain-manager</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+            <scope>test</scope>

+        </dependency> 

+        

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+        <plugins>

+            <plugin>

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

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>2.3.1</version>

+                <configuration>

+                    <includes>

+                        <include>**/*TestCase.java</include>

+                    </includes>

+                    <reportFormat>brief</reportFormat>

+                    <useFile>false</useFile>

+                    <forkMode>once</forkMode>

+                    <argLine>-ea -Xmx256m</argLine>

+                    <useSystemClassLoader>true</useSystemClassLoader>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
index af0539d2f6..5ae3ef51a9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -65,55 +65,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -225,7 +225,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
index ecab184de0..4b6adad633 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -58,55 +58,55 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -217,7 +217,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-simple-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-simple-ws/pom.xml
index 23e6dfcd74..5ca26e3223 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-simple-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-exceptions-simple-ws</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions/pom.xml
index 27c89834dd..83963ffc89 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-exceptions</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/extended-api/pom.xml
index d27a50f427..18beb8eff6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/extended-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/extended-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-extended-api</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -41,7 +41,7 @@
             
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             
             <scope>runtime</scope>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/http-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/http-jsonrpc/pom.xml
index 6fbf01d8a8..36f4bad5ba 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/http-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/http-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-http-jsonrpc</artifactId>
@@ -39,52 +39,52 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>       
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/pom.xml
index 0123d14906..d50d0fa424 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-implementation-jee-external-ear</artifactId>

@@ -33,39 +33,39 @@
         <dependency>

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

             <artifactId>tuscany-implementation-jee</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-contribution-jee</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-contribution-jee-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/interfaces/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/interfaces/pom.xml
index 290526f8df..4417f7428f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/interfaces/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-interfaces</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/java-init-exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/java-init-exceptions/pom.xml
index 2e18163110..41112431d1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/java-init-exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/java-init-exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-java-init-exceptions</artifactId>

@@ -33,20 +33,20 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -60,7 +60,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
index 572b0ba31e..7b9298c8e0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jaxws</artifactId>

@@ -32,34 +32,34 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>    

 

         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>            

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-args/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-args/pom.xml
index ed3bafe32f..5d981a3631 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-args/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-args/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-args</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-callbacks/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-callbacks/pom.xml
index bf5e35e747..0aa61f302a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-callbacks/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-callbacks/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-callbacks</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-definitions/pom.xml
index 6077aa000f..f789e62123 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-definitions</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/pom.xml
index f625960eb8..cf73a3ba98 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms-format</artifactId>
@@ -40,32 +40,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nonscaclient-exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nonscaclient-exceptions/pom.xml
index 0caaf0d6e9..3878f26a99 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nonscaclient-exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nonscaclient-exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-nonscaclient-exceptions</artifactId>

@@ -40,39 +40,39 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-noreplyto/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-noreplyto/pom.xml
index fb980d4f0b..6267680579 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-noreplyto/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-noreplyto/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-noreplyto</artifactId>

@@ -33,39 +33,39 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nulls/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nulls/pom.xml
index 96c60fd63f..525722ba2a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nulls/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-nulls/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-nulls</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-oneway-nocf/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-oneway-nocf/pom.xml
index add122c3ca..44d8eb1f01 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-oneway-nocf/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-oneway-nocf/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-oneway-nocf</artifactId>

@@ -40,39 +40,39 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-responsecf/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-responsecf/pom.xml
index a25c83066e..a343e3cc79 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-responsecf/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-responsecf/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-responsecf</artifactId>

@@ -40,39 +40,39 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-selectors/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-selectors/pom.xml
index 95d9681da7..88666b42e0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-selectors/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-selectors/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-selectors</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-topics/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-topics/pom.xml
index febdc1eec7..0583998074 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-topics/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-topics/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-topics</artifactId>

@@ -40,32 +40,32 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -78,7 +78,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-ttl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-ttl/pom.xml
index b87e6b55ec..65e2938e75 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-ttl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-ttl/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-ttl</artifactId>

@@ -40,33 +40,33 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -79,7 +79,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms/pom.xml
index 7f30339383..822695950d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms</artifactId>
@@ -40,39 +40,39 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/late-reference-resolution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/late-reference-resolution/pom.xml
index dc95ecbe2c..1792d451d0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/late-reference-resolution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/late-reference-resolution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-late-reference-resolution</artifactId>
@@ -40,60 +40,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                                        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/build.xml
index 47e6814621..2a2f53092c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/build.xml
@@ -22,96 +22,96 @@
 	

     <path id="repo.classpath">   	

     	<pathelement location="target/classes"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6-SNAPSHOT\tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6-SNAPSHOT\tuscany-host-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6-SNAPSHOT\tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6-SNAPSHOT\tuscany-policy-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6.1-SNAPSHOT\tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6.1-SNAPSHOT\tuscany-host-http-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6.1-SNAPSHOT\tuscany-binding-ws-axis2-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6.1-SNAPSHOT\tuscany-policy-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>

     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.6-SNAPSHOT\tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.6.1-SNAPSHOT\tuscany-implementation-java-runtime-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>

     	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>

     	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6-SNAPSHOT\tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6.1-SNAPSHOT\tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.6-SNAPSHOT\tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6-SNAPSHOT\tuscany-assembly-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.6.1-SNAPSHOT\tuscany-assembly-xsd-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6.1-SNAPSHOT\tuscany-assembly-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6-SNAPSHOT\tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6.1-SNAPSHOT\tuscany-core-databinding-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6-SNAPSHOT\tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6.1-SNAPSHOT\tuscany-policy-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.6-SNAPSHOT\tuscany-sca-api-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.6.1-SNAPSHOT\tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>

     	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>

     	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6-SNAPSHOT\tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6.1-SNAPSHOT\tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6-SNAPSHOT\tuscany-databinding-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6.1-SNAPSHOT\tuscany-databinding-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6-SNAPSHOT\tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6.1-SNAPSHOT\tuscany-binding-ws-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>

     	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>

     	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>

     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.6-SNAPSHOT\tuscany-policy-security-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6-SNAPSHOT\tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.6.1-SNAPSHOT\tuscany-policy-security-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6.1-SNAPSHOT\tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.6-SNAPSHOT\tuscany-domain-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.6.1-SNAPSHOT\tuscany-domain-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6-SNAPSHOT\tuscany-interface-java-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6.1-SNAPSHOT\tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6-SNAPSHOT\tuscany-contribution-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.6-SNAPSHOT\tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6.1-SNAPSHOT\tuscany-contribution-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.6.1-SNAPSHOT\tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>

     	<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>

     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.6-SNAPSHOT\tuscany-domain-api-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6-SNAPSHOT\tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.6.1-SNAPSHOT\tuscany-domain-api-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6.1-SNAPSHOT\tuscany-binding-sca-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.6-SNAPSHOT\tuscany-host-jetty-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.6.1-SNAPSHOT\tuscany-host-jetty-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>

     	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.6-SNAPSHOT\tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6-SNAPSHOT\tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.6.1-SNAPSHOT\tuscany-implementation-java-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6.1-SNAPSHOT\tuscany-binding-sca-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6-SNAPSHOT\tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6-SNAPSHOT\tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6.1-SNAPSHOT\tuscany-interface-wsdl-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6.1-SNAPSHOT\tuscany-binding-ws-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6-SNAPSHOT\tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6.1-SNAPSHOT\tuscany-databinding-axiom-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>

     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>

     	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6-SNAPSHOT\tuscany-core-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6-SNAPSHOT\tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6-SNAPSHOT\tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.6-SNAPSHOT\tuscany-node-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.6-SNAPSHOT\tuscany-definitions-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6.1-SNAPSHOT\tuscany-core-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6.1-SNAPSHOT\tuscany-interface-wsdl-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6.1-SNAPSHOT\tuscany-contribution-impl-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.6.1-SNAPSHOT\tuscany-node-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.6.1-SNAPSHOT\tuscany-definitions-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>

     	<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>

     	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6-SNAPSHOT\tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6.1-SNAPSHOT\tuscany-host-embedded-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>

     	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>

     	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>

     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>

     	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>

     	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6-SNAPSHOT\tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6.1-SNAPSHOT\tuscany-interface-java-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>

     	<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>

     	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6-SNAPSHOT\tuscany-interface-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6.1-SNAPSHOT\tuscany-interface-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>  	

    </path>	

     	

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/pom.xml
index 4df53f4e18..0cde1bf745 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/oneway/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-oneway</artifactId>

@@ -33,26 +33,26 @@
         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

                 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/operation-overloading/pom.xml
index 468ba80da4..f18bce59f4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/operation-overloading/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-operation-overloading</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
index a93e64237f..7b8235a542 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-contribution-classes</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes/pom.xml
index 62bedf61e4..93bd473906 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-classes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-contribution-classes-v2</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-test/pom.xml
index 6d543876d0..f744811770 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/contribution-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-contribution-test</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/pom.xml
index 29c3609c59..8ebf4a3faf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-osgi</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
index 12e2f7ea65..fd16af6962 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-implementation</artifactId>
@@ -74,54 +74,54 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -140,7 +140,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 34fefd68ac..7b8dbf5045 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-osgi-tuscany-test</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/pom.xml
index 1ed5bb001d..beaab35975 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-osgi-tuscany</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/test-bundles/pom.xml
index ae651a75c1..4a9d1f7777 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/test-bundles/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-osgi-tuscany-test-bundles</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 3232784c33..9954d5e63d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-tuscany-installer</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 8bb73d1f18..c9322d8fad 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-tuscany/tuscany-versioned/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-tuscany-versioned</artifactId>
@@ -626,7 +626,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/pom.xml
index 5bedabfb5b..c40bda7471 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-security-basicauth</artifactId>
@@ -32,48 +32,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-jsr250/pom.xml
index cd64e65167..76083a7dab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-jsr250/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-security-jsr250</artifactId>
@@ -32,35 +32,35 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-token/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-token/pom.xml
index fc114918e0..e0e752e0a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-token/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-security-token</artifactId>
@@ -32,47 +32,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security/pom.xml
index ce7842d5c6..8eac533022 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-security</artifactId>
@@ -32,28 +32,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy/pom.xml
index ceb3e7dbe3..dac326ca35 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy</artifactId>
@@ -32,28 +32,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
index 14312bfade..4dc95deb3d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
@@ -164,13 +164,13 @@
                 <dependency>
 	    	    <groupId>org.apache.tuscany.sca</groupId>
 	    	    <artifactId>tuscany-host-webapp</artifactId>
-	    	    <version>1.6-SNAPSHOT</version>
+	    	    <version>1.6.1-SNAPSHOT</version>
                     <scope>runtime</scope>
 	    	</dependency>
                 <dependency>
 	    	    <groupId>org.apache.tuscany.sca</groupId>
 	    	    <artifactId>tuscany-host-webapp-junit</artifactId>
-	    	    <version>1.6-SNAPSHOT</version>
+	    	    <version>1.6.1-SNAPSHOT</version>
                     <scope>runtime</scope>
 	    	</dependency>
                 <dependency>
@@ -257,7 +257,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -348,7 +348,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -442,7 +442,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -535,7 +535,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -632,7 +632,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/promotion-interface-missmatch/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/promotion-interface-missmatch/pom.xml
index a26b164892..4385266a76 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/promotion-interface-missmatch/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/promotion-interface-missmatch/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-promotion-interface-missmatch</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/properties/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/properties/pom.xml
index 9624815357..98e3f42ef4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/properties/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/properties/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-properties</artifactId>

@@ -32,34 +32,34 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-multi-level/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-multi-level/pom.xml
index b18e5f6914..03195f8e85 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-multi-level/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>itest-recursive-multi-level</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>       
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-ws/pom.xml
index e3110d3f86..6201853d1f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-recursive-ws</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -77,7 +77,7 @@
                 <dependency>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-host-jetty</artifactId>
-                    <version>1.6-SNAPSHOT</version>
+                    <version>1.6.1-SNAPSHOT</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive/pom.xml
index a3d5ba9e1b..2982e65c9a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/recursive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-recursive</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/references-collection/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/references-collection/pom.xml
index 31ca4e6907..fb20c382e9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/references-collection/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/references-collection/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-references-collection</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/references/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/references/pom.xml
index eb6f079a34..f0e1c34ee8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/references/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-references</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/scopes/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/scopes/pom.xml
index a08a13a4d0..21bfb5b177 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/scopes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scopes</artifactId>    
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/serialization/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/serialization/pom.xml
index 79fec1f707..be2ec5f9fb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/serialization/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/serialization/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-serialization</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>       
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
            
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/services/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/services/pom.xml
index e7b5c8bd72..45361d646c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-services</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/spring/pom.xml
index dbeebc48f1..c8e5374239 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-spring</artifactId>
@@ -32,67 +32,67 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 	  <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/transaction/pom.xml
index dabbb1a6ce..b5374897a7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-transaction</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/validation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/validation/pom.xml
index 5f4de7cf26..61368f8c96 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/validation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-validation</artifactId>
@@ -33,61 +33,61 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                 	<groupId>org.apache.openejb</groupId>
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -112,20 +112,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                 	<groupId>org.apache.openejb</groupId>
@@ -137,19 +137,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wires/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wires/pom.xml
index 019eef1764..6b36a5c662 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wires/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wires</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml
index 500db282a8..ebf4c9fcf4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/workspace-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-workspace-manager</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>         
                         
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/ws-void-args-return/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/ws-void-args-return/pom.xml
index 2da07c3aa2..b7317f700e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/ws-void-args-return/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/ws-void-args-return/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-ws-void-args-return</artifactId>

@@ -32,27 +32,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl-multiple/pom.xml
index eaea89e7a2..cb09ae4d7e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl-multiple/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wsdl-multiple</artifactId>
@@ -32,48 +32,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl/pom.xml
index b394cf2427..ff3888503e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wsdl</artifactId>
@@ -32,48 +32,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl2java/pom.xml
index 7bc4a4688c..4aaecdd6d6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdl2java/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-wsdl2java</artifactId>
@@ -32,42 +32,42 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -160,7 +160,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.6.1-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
index b9ee5d97f3..26a7185f2e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wsdlgen</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
 
@@ -65,14 +65,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlless/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlless/pom.xml
index ab0e767d9a..2fca7c721e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlless/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wsdlless</artifactId>
@@ -46,48 +46,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xml/pom.xml
index 5cc43aacf7..4bd81e3838 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml</artifactId>
@@ -32,37 +32,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
@@ -87,35 +87,35 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/pom.xml
index bfa6356ec1..16e012b4a6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly/pom.xml
index ee630cd5d5..7ca3b99cff 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/pom.xml
index d17470a17f..57c62d2d77 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,55 +33,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -156,21 +156,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js-dojo/pom.xml
index c1b9caa69b..f19a449c04 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js/pom.xml
index ab95051606..7412fedf65 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-js/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom/pom.xml
index 121bf0d137..a47b362182 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>			
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
         </dependency>
 		
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba-runtime/pom.xml
index 19b9e88e27..449d36808a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-corba-runtime</artifactId>
@@ -32,25 +32,25 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
     
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 	
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba/pom.xml
index 5279c6003d..bdf33e4503 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-corba</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-host-corba</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 	</dependency>
 	
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-dwr/pom.xml
index 2fc029350d..bc6ab7f8ed 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-dwr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-dwr/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-extension-helper</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb-runtime/pom.xml
index 6f78f68190..0759aa0334 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -73,14 +73,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb/pom.xml
index a8cf5be26a..a4dd405718 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,31 +34,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang-runtime/pom.xml
index f3a2a4c3d2..5e422f76ab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-binding-erlang-runtime</artifactId>

@@ -39,20 +39,20 @@
 		<dependency>

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

 			<artifactId>tuscany-interface-java</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		

 		<dependency>

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

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

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 			<scope>runtime</scope>

 		</dependency>

     

 		<dependency>

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

 			<artifactId>tuscany-binding-erlang</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		

 		<dependency>

@@ -64,7 +64,7 @@
 		<dependency>

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

 			<artifactId>tuscany-host-embedded</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 			<scope>test</scope>

 		</dependency>

 		

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang/pom.xml
index c5854ce58b..626101a7a5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-erlang/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-binding-erlang</artifactId>

@@ -33,13 +33,13 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 	

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata-runtime/pom.xml
index 89c420e9b2..d1f555cb70 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata-runtime/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -40,43 +40,43 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-gdata</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-core-spi</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-http</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -125,21 +125,21 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata/pom.xml
index 2dcbef6f7b..3b11de9cc1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-gdata/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-hessian/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-hessian/pom.xml
index 15ed1e5d19..1181709f06 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-hessian/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-hessian/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-binding-hessian</artifactId>

@@ -33,7 +33,7 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -44,13 +44,13 @@
        <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>        

         

@@ -71,7 +71,7 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

@@ -79,7 +79,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc-runtime/pom.xml
index 568d4eaaa6..f2e590b433 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,43 +33,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-jsonrpc</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
@@ -89,14 +89,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc/pom.xml
index 08f2e084bf..f73a682822 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-runtime/pom.xml
index 3497e666ea..3b3f6917d1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -64,28 +64,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/pom.xml
index 3d907ceca5..0572047b4d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-policy/pom.xml
index 03e09982d5..63f89faee4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms-policy</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -57,19 +57,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-reliability</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>       
     </dependencies>
 		
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/pom.xml
index 6e1598872b..f4b4d3f1c5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms-runtime</artifactId>
@@ -33,55 +33,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jms</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -100,14 +100,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms/pom.xml
index 682f3e1bcb..c3689fcb12 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js-dojo/pom.xml
index ecb94283ac..82c65be542 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
     
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js/pom.xml
index 2f9c543aad..157f3c341b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-js/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
     
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-runtime/pom.xml
index 2284282fc3..e620e4621a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,43 +33,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
@@ -107,14 +107,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc/pom.xml
index 3a6dda7bbf..588c387dd2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-notification/pom.xml
index 709f611a52..22aeac2d34 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-notification/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

@@ -33,32 +33,32 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

             <groupId>org.codehaus.woodstox</groupId>

@@ -81,7 +81,7 @@
         <dependency>

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

             <artifactId>tuscany-databinding-axiom</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

         <dependency>

@@ -106,7 +106,7 @@
         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi-runtime/pom.xml
index 367b434afc..2e6e1c26dd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi-runtime</artifactId>
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi/pom.xml
index bbd08bc2e3..6db41cd6db 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss-rome/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss-rome/pom.xml
index 227bb1f026..1df84aa9f9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss-rome/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss-rome/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,43 +33,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -94,21 +94,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss/pom.xml
index d315328f28..627dc38c24 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-rss/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,38 +33,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-axis2/pom.xml
index 388cceca7d..9e27da0fe9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-axis2/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-binding-sca</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>      

         

         <dependency>

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

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>            

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-endpoint</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-corba/pom.xml
index bfe12f1d0e..088fb1e824 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-corba/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -37,50 +37,50 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-jms/pom.xml
index cf8c507af3..6d40629880 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-jms/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-binding-sca</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>      

         

         <dependency>

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

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>            

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-endpoint</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-xml/pom.xml
index 47ccd937fb..88eb661e0c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca-xml/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>   
               
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca/pom.xml
index e53377e79e..955bd14ae2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-sca/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,31 +35,31 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2-policy/pom.xml
index f4fc8033a0..7d94aaacc5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2-policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2-policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 		
     	<dependency>
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
index 6912857ebc..d724515042 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,63 +42,63 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -311,21 +311,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-wsdlgen/pom.xml
index 36d155610a..06f8ee1688 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-binding-ws-wsdlgen</artifactId>

@@ -33,42 +33,42 @@
         <dependency>

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

             <artifactId>tuscany-binding-ws</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-java</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-java-jaxws</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>        

         <dependency>

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

             <artifactId>tuscany-xsd</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-xsd-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

             <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/pom.xml
index 1e3abd8ea7..268873e39f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-xml</artifactId>
@@ -32,50 +32,50 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>                
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws/pom.xml
index f973665cde..4d74647b2c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-groovy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-groovy/pom.xml
index 7e17734bfe..370dca4226 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-groovy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -44,14 +44,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-impl/pom.xml
index 3d9dfbe314..97b0abc6e3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-impl</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-java/pom.xml
index da2318ec71..94de6f9b65 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-java</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee-impl/pom.xml
index 3442beb923..e90d886a0d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-jee-impl</artifactId>
@@ -32,35 +32,35 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <!-- TUSCANY-3165 Waiting for 3.0.2 to be released so 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml
index f43b95a3b6..cc9beb863f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-jee</artifactId>
@@ -38,30 +38,30 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-namespace/pom.xml
index ed0275a947..2bab67722b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-namespace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-namespace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-namespace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-osgi/pom.xml
index 244f5fdf9b..8e59df49bc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-osgi</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-resource/pom.xml
index 19fa153548..b5bbf15eba 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-resource</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-xml/pom.xml
index c0614b8687..f28d3ce429 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution/pom.xml
index a98bb10117..3b5eb96757 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
             	
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/core-databinding/pom.xml
index 94779b5e4a..7db7e4c5b2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/core-spi/pom.xml
index f2a15cd1c2..501f0c4169 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,50 +32,50 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>                        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/core/pom.xml
index de5e7f42d4..1a837c6d2d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/data-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/data-api/pom.xml
index 2c7a152917..bf95bcfba8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/data-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/data-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-data-api</artifactId>

@@ -32,7 +32,7 @@
 		<dependency>

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

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

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 	</dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-axiom/pom.xml
index 2ea580d9ef..1528dcf7a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-fastinfoset/pom.xml
index 78cc507308..4a92847892 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-fastinfoset/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-fastinfoset</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb-axiom/pom.xml
index 1c36d65b59..0fab7e0b53 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb/pom.xml
index fea6048954..be48666d05 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-json/pom.xml
index 140691460b..efc84d22c8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-json/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-json</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/pom.xml
index 2e6e5b01b1..ab40e47900 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-saxon</artifactId>
@@ -44,13 +44,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <!--dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo-axiom/pom.xml
index b8e8ab076f..2180525fb5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo-axiom</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
        <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo/pom.xml
index 29937636d3..fe0cb1b033 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <!-- FIXME: We might want to create a separate module to host the processor -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xmlbeans/pom.xml
index 504cf501c5..3773fc1a35 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xmlbeans/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-xmlbeans</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xstream/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xstream/pom.xml
index 8469398b9a..7a45d9a6ca 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xstream/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-xstream/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-xstream</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding/pom.xml
index 16cc3e5cdd..4923416c16 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-databinding</artifactId>
@@ -32,31 +32,31 @@
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>		
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions-xml/pom.xml
index 39a5efd2c6..eedf40b3c1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-definitions-xml</artifactId>

@@ -32,31 +32,31 @@
     	<dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-definitions</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     	

         <dependency>

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

             <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions/pom.xml
index 56bbda2d45..24470dff28 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-definitions</artifactId>

@@ -32,19 +32,19 @@
     	<dependency>

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

             <artifactId>tuscany-extensibility</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     

     	<dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/pom.xml
index 6c46fe5209..13e0c70ab6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-domain-manager</artifactId>
@@ -32,62 +32,62 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -112,75 +112,75 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-search</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -193,14 +193,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/pom.xml
index 59a34a420c..019da0904d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/pom.xml
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-domain-search</artifactId>
-    <name>Apache Tuscany SCA Domain Search Component</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-		<dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-	    	<version>2.9.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-highlighter</artifactId>
-	    	<version>2.9.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-memory</artifactId>
-	    	<version>2.9.1</version>
-        </dependency>
-
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.domain.search</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.domain.search*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>tuscany-modules</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>tuscany-domain-search</artifactId>

+    <name>Apache Tuscany SCA Domain Search Component</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>tuscany-assembly</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-contribution</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-extensibility</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-interface</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-policy</artifactId>

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

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

+            <version>1.6.1-SNAPSHOT</version>

+        </dependency>

+

+		<dependency>

+            <groupId>org.apache.lucene</groupId>

+            <artifactId>lucene-core</artifactId>

+	    	<version>2.9.1</version>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.lucene</groupId>

+            <artifactId>lucene-highlighter</artifactId>

+	    	<version>2.9.1</version>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.lucene</groupId>

+            <artifactId>lucene-memory</artifactId>

+	    	<version>2.9.1</version>

+        </dependency>

+

+    </dependencies>

+

+

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.felix</groupId>

+                <artifactId>maven-bundle-plugin</artifactId>

+

+                <configuration>

+                    <instructions>

+                        <Bundle-Version>${tuscany.version}</Bundle-Version>

+                        <Bundle-SymbolicName>org.apache.tuscany.sca.domain.search</Bundle-SymbolicName>

+                        <Bundle-Description>${pom.name}</Bundle-Description>

+                        <Export-Package>org.apache.tuscany.sca.domain.search*</Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/endpoint/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/endpoint/pom.xml
index ddcf178a76..43958e624b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/endpoint/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/endpoint/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,59 +35,59 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>           
                
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-equinox/pom.xml
index 83a720fc73..8745b2a90e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-equinox/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility-equinox</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-osgi/pom.xml
index 0e9a305867..54c0624e37 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility-osgi/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.6-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-extensibility-osgi</artifactId>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-extensibility</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility/pom.xml
index b20316ad69..85fa59b6a5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/extension-helper/pom.xml
index 2ac4a59b2c..6033e1fbc0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/extension-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/extension-helper/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,25 +35,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jee/pom.xml
index 66bc712c78..cf9aed214d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>tuscany-host-corba-jee</artifactId>
     <name>Apache Tuscany SCA JEE environment CORBA Host</name>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse-tns/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse-tns/pom.xml
index 7e91f872cb..62a1a6abf4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse-tns/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

     </parent>

     <artifactId>tuscany-host-corba-jse-tns</artifactId>

     <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>

@@ -32,19 +32,19 @@
         <dependency>

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

             <artifactId>tuscany-host-corba</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-corba-jse</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse/pom.xml
index ac1e2046fd..f11d3c9f81 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>tuscany-host-corba-jse</artifactId>
     <name>Apache Tuscany SCA JSE built-in CORBA Host</name>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba/pom.xml
index 6ca494b264..49ae238db2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>tuscany-host-corba</artifactId>
     <name>Apache Tuscany SCA CORBA Host Extension Point</name>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-ejb/pom.xml
index 4ab771d3e7..3521689681 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-host-ejb</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-embedded/pom.xml
index 3ede75bc6f..e1ececf570 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-embedded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-embedded</artifactId>
@@ -32,85 +32,85 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
      
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-http/pom.xml
index f4f79e729f..23a288623a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-http</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jetty/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jetty/pom.xml
index 9af70fe18c..523e177b29 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-jetty</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms-asf/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms-asf/pom.xml
index c831b6a02a..c69b4ed22a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms-asf/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms-asf/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-host-jms-asf</artifactId>

@@ -32,24 +32,24 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms/pom.xml
index 60d9484452..22694fb56f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-host-jms</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-openejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-openejb/pom.xml
index 9ab6b9c47b..ceeee505e6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-openejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-openejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-host-openejb</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-host-ejb</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-rmi/pom.xml
index 16d0b7204c..aa17948cc3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-host-rmi</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-tomcat/pom.xml
index 9fd5da7e00..eeec7c1602 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-tomcat</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-	        <version>1.6-SNAPSHOT</version>
+	        <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-webapp/pom.xml
index de8a945ce5..57c7e920d9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-	        <version>1.6-SNAPSHOT</version>
+	        <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-	        <version>1.6-SNAPSHOT</version>
+	        <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel-ode/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel-ode/pom.xml
index 7c454116a1..bb9ca9eba0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel-ode/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel-ode/pom.xml
@@ -22,7 +22,7 @@
 	<parent>

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

 		<artifactId>tuscany-modules</artifactId>

-		<version>1.6-SNAPSHOT</version>

+		<version>1.6.1-SNAPSHOT</version>

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

 	</parent>

 	<artifactId>tuscany-implementation-bpel-ode</artifactId>

@@ -31,67 +31,67 @@
 		<dependency>

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

 			<artifactId>tuscany-assembly</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-implementation-bpel</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-core</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-assembly-xml</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-contribution-impl</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding-sdo</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-host-embedded</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel/pom.xml
index 972d90c9df..3453a6967b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>

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

 		<artifactId>tuscany-modules</artifactId>

-		<version>1.6-SNAPSHOT</version>

+		<version>1.6.1-SNAPSHOT</version>

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

 	</parent>

 	<artifactId>tuscany-implementation-bpel</artifactId>

@@ -32,43 +32,43 @@
 		<dependency>

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

 			<artifactId>tuscany-assembly</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-assembly-xml</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-java</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-ejb/pom.xml
index 54e7c3e762..46488d40f6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,31 +34,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope> 
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-runtime/pom.xml
index ec37cec9c2..e221ab51dd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-xml/pom.xml
index c1c4bbdfba..5d34347ac0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-xml</artifactId>
@@ -80,13 +80,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java/pom.xml
index 4a55a78bb1..3ad93dedf6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-jee/pom.xml
index 40cdb4ad9a..87a6be3a45 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-jee/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-jee/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,32 +37,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope> 
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope> 
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/pom.xml
index 9c49d21b19..3b7c09f4f5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node/pom.xml
index 49ea23fbe1..73c720b5ff 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-notification/pom.xml
index 14f5af0d34..b91a3d3fa2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-notification/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

@@ -33,37 +33,37 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 		        

         <!-- test dependencies -->

@@ -84,7 +84,7 @@
         <dependency>

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

             <artifactId>tuscany-binding-sca</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

              <scope>test</scope>

         </dependency>        

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-osgi/pom.xml
index fbc47a1631..1d2596b912 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -44,79 +44,79 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource-runtime/pom.xml
index 98388ec481..d1a76734d0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource/pom.xml
index ce201c765e..4151446d84 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-script/pom.xml
index 6cf0b1812b..78dd1a89db 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-script/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-extension-helper</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

@@ -54,7 +54,7 @@
         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

        <dependency>

@@ -112,7 +112,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring-runtime/pom.xml
index df2c65008e..54fde15b42 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

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

@@ -43,7 +43,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>provided</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring/pom.xml
index 0853d4ff81..b9f37ceace 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring</artifactId>
@@ -41,48 +41,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
           
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/pom.xml
index ef5aea7820..87549bbd5e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,19 +35,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -67,14 +67,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web/pom.xml
index ba728e8462..f768f0c66f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

@@ -34,39 +34,39 @@
         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-contribution-jee</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-dojo/pom.xml
index c5508d689e..e3d543d4c0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-widget-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-tuscany/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-tuscany/pom.xml
index 8eea9407f5..82ecc98d49 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-tuscany/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime-tuscany/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,26 +33,26 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-widget-runtime</artifactId>
-			<version>1.6-SNAPSHOT</version>
+			<version>1.6.1-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -67,14 +67,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime/pom.xml
index 778ea15851..14cd03c997 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>           
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
        <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget/pom.xml
index d73b78c987..f653c179c4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-widget/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-xquery/pom.xml
index 135bc43a65..de664249be 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-xquery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,44 +33,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
index 0085be26c3..cfc8456e40 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-jaxws</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-xml/pom.xml
index a9004dc1ef..ab01a0f1a9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-xml</artifactId>
@@ -32,32 +32,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java/pom.xml
index d82529b74c..fdd7f30edb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/pom.xml
index a31440ca39..3d4916cd8f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl-xml</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl/pom.xml
index 9b685022b3..abd2b30acd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface/pom.xml
index 85b3244969..3a5d7a7fed 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/monitor/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/monitor/pom.xml
index 9cee24bddc..cfeaf2205b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/monitor/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-api/pom.xml
index 9a6666eb6e..65ff76bd7e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

@@ -34,7 +34,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-impl/pom.xml
index 0b9c502d5b..7496dc7f58 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,98 +35,98 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
               
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher-osgi/pom.xml
index e6e29ebd6d..3cdced91ff 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -61,41 +61,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
               
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher/pom.xml
index 584cc1ab91..1d5daaae53 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-manager/pom.xml
index adc480b683..c2beb5fcc6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/node-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/node-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,43 +33,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-	        <version>1.6-SNAPSHOT</version>
+	        <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -82,28 +82,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/osgi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/osgi-runtime/pom.xml
index a5639cb733..b9c0e88c00 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/osgi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/osgi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-osgi-runtime</artifactId>
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-logging/pom.xml
index 642afbcba4..41a71f58fd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-logging/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-logging/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-policy-logging</artifactId>

@@ -33,25 +33,25 @@
         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-reliability/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-reliability/pom.xml
index c04bc95a2d..3c94b5fed8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-reliability/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-reliability/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-reliability</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-geronimo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-geronimo/pom.xml
index 4cd7b03ac9..270c628381 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-geronimo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-geronimo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security-geronimo</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
        <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-http/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-http/pom.xml
index b3c6b95f9b..83defa09c8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security-http</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-jsr250/pom.xml
index b4212b14e3..5316254bb3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security-jsr250/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security-jsr250</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security/pom.xml
index 779d0b9000..3149b35fc4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-policy-security</artifactId>

@@ -32,19 +32,19 @@
         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

                 

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-transaction/pom.xml
index 6803e5a738..850770e78b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml-ws/pom.xml
index 212038bfe5..fa5d233702 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-xml-ws</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml/pom.xml
index 5d1b396fdc..06ce110ae5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-policy-xml</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy/pom.xml
index f00612b61f..81074e3858 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
index 0371aac87d..970ce04ace 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api-extension/pom.xml
index 95d09ed1c9..5989d6a06f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
  
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/pom.xml
index cf8f388ae1..2224942266 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/tracing-aspectj/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/tracing-aspectj/pom.xml
index 20578bf166..5e72ed62cb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/tracing-aspectj/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/tracing-aspectj/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-tracing-aspectj</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript-dojo/pom.xml
index ff987e4c7a..db3ff6c266 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript/pom.xml
index 62518e3406..f655113ea5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/web-javascript/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-impl/pom.xml
index d08880e88c..3b0442959d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-impl</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml
index e42066ee3b..0dda1fd60d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-manager</artifactId>
@@ -32,37 +32,37 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-xml/pom.xml
index 1e4257e50d..e606c649f9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace/pom.xml
index 7b2c5f5358..3d2d8e30b2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/workspace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd-xml/pom.xml
index c77c92c55d..b0321aac6b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-xsd-xml</artifactId>

@@ -32,32 +32,32 @@
         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-xsd</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd/pom.xml
index 674ac63615..1639680d9a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-xsd</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/pom.xml
index ec645c20d8..5031de5ad6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/pom.xml
@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (1.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:http://svn.eu.apache.org/repos/asf/tuscany/sca-java-1.x/branches/sca-java-1.6</connection>
@@ -318,7 +318,7 @@
                 <plugin>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-maven-osgi-junit</artifactId>
-                    <version>1.6-SNAPSHOT</version>
+                    <version>1.6.1-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <id>osgi-test</id>
@@ -346,7 +346,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-dependency-lister</artifactId>
-                        <version>1.6-SNAPSHOT</version>
+                        <version>1.6.1-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/pom.xml
index 75e36e4b1a..39bf9677f1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-echo-extension</artifactId>
@@ -39,26 +39,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/pom.xml
index 4fd96aa40b..1d69491f90 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-echo</artifactId>
@@ -39,19 +39,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/pom.xml
index 0bd593fea1..554ac58daf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/pom.xml
@@ -22,54 +22,54 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-broker</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Broker</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.6.1-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <!-- test dependencies -->

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>  

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>     

         <!-- test dependencies -->

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/pom.xml
index dae190f23b..b3a2a4f222 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/pom.xml
@@ -22,60 +22,60 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-consumer</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Consumer</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.6.1-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/pom.xml
index a9d93a5b38..f0a97226e3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/pom.xml
@@ -22,46 +22,46 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-producer</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Producer</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.6.1-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -75,7 +75,7 @@
         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/pom.xml
index 309c6594e2..87c3454f41 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-corba-reference</artifactId>

@@ -39,24 +39,24 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 	<dependency>

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

             <artifactId>tuscany-host-corba-jse</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/pom.xml
index 54839fe626..bc38a3657e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-corba-service</artifactId>

@@ -39,24 +39,24 @@
 		<dependency>

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

 			<artifactId>tuscany-host-embedded</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 			<scope>runtime</scope>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-binding-corba-runtime</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 			<scope>runtime</scope>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-host-corba-jse-tns</artifactId>

-			<version>1.6-SNAPSHOT</version>

+			<version>1.6.1-SNAPSHOT</version>

 			<scope>runtime</scope>

 		</dependency>

 		<dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/pom.xml
index c0536fb3ae..65fdd39d3f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-distributed</artifactId>
@@ -40,53 +40,53 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                                        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/pom.xml
index 863acc6c3d..07870ea2e6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-impl-policies</artifactId>

@@ -39,13 +39,13 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -59,14 +59,14 @@
         <dependency>

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

             <artifactId>tuscany-policy-logging</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-security</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-lean/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-lean/pom.xml
index 9e8dcf34ac..739dba467a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-lean/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-lean/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-lean</artifactId>

@@ -39,20 +39,20 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/pom.xml
index 9ea2463937..750e7b8536 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-rmi-reference</artifactId>

@@ -39,18 +39,18 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/pom.xml
index 56cd05e92c..08c4972df5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-rmi-service</artifactId>

@@ -39,18 +39,18 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/pom.xml
index ab40071b10..0ba7284961 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-script</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/pom.xml
index 54de1f0735..b67de495b0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-webapp</artifactId>

@@ -40,13 +40,13 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -81,7 +81,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.6.1-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 48478ecd93..4f3e88981d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -25,7 +25,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-calculator-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
     </d:environment>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/pom.xml
index 2d89b28320..b9a582d889 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-ws-secure-webapp</artifactId>

@@ -41,19 +41,19 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -87,7 +87,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.6.1-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 7b2dc6b73a..eb8786e13a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>

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

             <d:artifactId>sample-calculator-ws-webapp</d:artifactId>

-            <d:version>1.6-SNAPSHOT</d:version>

+            <d:version>1.6.1-SNAPSHOT</d:version>

             <d:type>war</d:type>

         </d:moduleId>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/pom.xml
index 71725be8d0..37ab466a79 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-ws-webapp</artifactId>

@@ -41,19 +41,19 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -88,7 +88,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.6.1-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 344baeb738..087f077bbc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/pom.xml
index 025d677929..a318ef4058 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/pom.xml
index 76f960f005..9d61cbde72 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-callback-ws-client</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>       

 

@@ -73,7 +73,7 @@
         <dependency>

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

             <artifactId>sample-callback-ws-service</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/pom.xml
index 99671a27fb..495983e05f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-callback-ws-service</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>      

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/pom.xml
index 6fc529c898..661d76b437 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-callbacks-jms</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -84,14 +84,14 @@
         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 -->

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/pom.xml
index bd82523d81..515296ee4b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-chat-webapp</artifactId>

@@ -41,20 +41,20 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -82,7 +82,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.6.1-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index c4aeed3028..dc290443c3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-chat-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/pom.xml
index ab3b9458fe..9c98137550 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-customer-dojo-webapp</artifactId>
@@ -40,26 +40,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
          </dependency>
 		         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                         
@@ -153,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 544e4b96c9..21dde0c2e5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-customer-dojo-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/pom.xml
index ebd268b20e..2dbcd27427 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-customer-dojo</artifactId>
@@ -39,47 +39,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
                 
 		<dependency>
@@ -172,7 +172,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/pom.xml
index 6c7099e3f2..f822f23d09 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -40,31 +40,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>          
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-management/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-management/pom.xml
index 7bdd5f70f9..1a0e6bd835 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-management/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-domain-management</artifactId>
@@ -39,73 +39,73 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -117,48 +117,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -177,7 +177,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
index 77689cddb7..788b6dc589 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
@@ -135,41 +135,41 @@
         <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

         <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

         <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6-SNAPSHOT\sca-api-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6-SNAPSHOT\tuscany-assembly-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6-SNAPSHOT\tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6-SNAPSHOT\tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6-SNAPSHOT\tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6-SNAPSHOT\tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6-SNAPSHOT\tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6-SNAPSHOT\tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6-SNAPSHOT\tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6-SNAPSHOT\tuscany-contribution-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6-SNAPSHOT\tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6-SNAPSHOT\tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6-SNAPSHOT\tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6-SNAPSHOT\tuscany-core-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6-SNAPSHOT\tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6-SNAPSHOT\tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6-SNAPSHOT\tuscany-databinding-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6-SNAPSHOT\tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6-SNAPSHOT\tuscany-distributed-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6-SNAPSHOT\tuscany-distributed-impl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6-SNAPSHOT\tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6-SNAPSHOT\tuscany-host-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.6-SNAPSHOT\tuscany-host-jetty-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.6-SNAPSHOT\tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.6-SNAPSHOT\tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.6-SNAPSHOT\tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6-SNAPSHOT\tuscany-interface-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6-SNAPSHOT\tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6-SNAPSHOT\tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6-SNAPSHOT\tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6-SNAPSHOT\tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6-SNAPSHOT\tuscany-policy-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6-SNAPSHOT\tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6-SNAPSHOT\tuscany-topology-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6-SNAPSHOT\tuscany-topology-xml-1.6-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6.1-SNAPSHOT\sca-api-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6.1-SNAPSHOT\tuscany-assembly-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6.1-SNAPSHOT\tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6.1-SNAPSHOT\tuscany-binding-sca-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6.1-SNAPSHOT\tuscany-binding-sca-axis2-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6.1-SNAPSHOT\tuscany-binding-sca-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6.1-SNAPSHOT\tuscany-binding-ws-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6.1-SNAPSHOT\tuscany-binding-ws-axis2-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6.1-SNAPSHOT\tuscany-binding-ws-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6.1-SNAPSHOT\tuscany-contribution-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6.1-SNAPSHOT\tuscany-contribution-impl-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6.1-SNAPSHOT\tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6.1-SNAPSHOT\tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6.1-SNAPSHOT\tuscany-core-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6.1-SNAPSHOT\tuscany-core-databinding-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6.1-SNAPSHOT\tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6.1-SNAPSHOT\tuscany-databinding-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6.1-SNAPSHOT\tuscany-databinding-axiom-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6.1-SNAPSHOT\tuscany-distributed-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6.1-SNAPSHOT\tuscany-distributed-impl-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6.1-SNAPSHOT\tuscany-host-embedded-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6.1-SNAPSHOT\tuscany-host-http-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.6.1-SNAPSHOT\tuscany-host-jetty-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.6.1-SNAPSHOT\tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.6.1-SNAPSHOT\tuscany-implementation-java-runtime-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.6.1-SNAPSHOT\tuscany-implementation-java-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6.1-SNAPSHOT\tuscany-interface-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6.1-SNAPSHOT\tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6.1-SNAPSHOT\tuscany-interface-java-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6.1-SNAPSHOT\tuscany-interface-wsdl-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6.1-SNAPSHOT\tuscany-interface-wsdl-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6.1-SNAPSHOT\tuscany-policy-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6.1-SNAPSHOT\tuscany-policy-xml-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6.1-SNAPSHOT\tuscany-topology-1.6.1-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6.1-SNAPSHOT\tuscany-topology-xml-1.6.1-SNAPSHOT.jar"/>

         <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

         <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

         <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

@@ -205,40 +205,40 @@
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

     	<pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

     	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6-SNAPSHOT\sca-api-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6-SNAPSHOT\tuscany-assembly-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6-SNAPSHOT\tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.6-SNAPSHOT\tuscany-binding-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.6-SNAPSHOT\tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6-SNAPSHOT\tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6-SNAPSHOT\tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6-SNAPSHOT\tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6-SNAPSHOT\tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6-SNAPSHOT\tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6-SNAPSHOT\tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6-SNAPSHOT\tuscany-contribution-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6-SNAPSHOT\tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6-SNAPSHOT\tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6-SNAPSHOT\tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6-SNAPSHOT\tuscany-core-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6-SNAPSHOT\tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6-SNAPSHOT\tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6-SNAPSHOT\tuscany-databinding-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6-SNAPSHOT\tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6-SNAPSHOT\tuscany-distributed-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6-SNAPSHOT\tuscany-distributed-impl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.6-SNAPSHOT\tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6-SNAPSHOT\tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6-SNAPSHOT\tuscany-host-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6-SNAPSHOT\tuscany-interface-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6-SNAPSHOT\tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6-SNAPSHOT\tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6-SNAPSHOT\tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6-SNAPSHOT\tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6-SNAPSHOT\tuscany-policy-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6-SNAPSHOT\tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6-SNAPSHOT\tuscany-topology-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6-SNAPSHOT\tuscany-topology-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6.1-SNAPSHOT\sca-api-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6.1-SNAPSHOT\tuscany-assembly-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6.1-SNAPSHOT\tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.6.1-SNAPSHOT\tuscany-binding-http-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.6.1-SNAPSHOT\tuscany-binding-jsonrpc-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6.1-SNAPSHOT\tuscany-binding-sca-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6.1-SNAPSHOT\tuscany-binding-sca-axis2-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6.1-SNAPSHOT\tuscany-binding-sca-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6.1-SNAPSHOT\tuscany-binding-ws-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6.1-SNAPSHOT\tuscany-binding-ws-axis2-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6.1-SNAPSHOT\tuscany-binding-ws-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6.1-SNAPSHOT\tuscany-contribution-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6.1-SNAPSHOT\tuscany-contribution-impl-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6.1-SNAPSHOT\tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6.1-SNAPSHOT\tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6.1-SNAPSHOT\tuscany-core-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6.1-SNAPSHOT\tuscany-core-databinding-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6.1-SNAPSHOT\tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6.1-SNAPSHOT\tuscany-databinding-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6.1-SNAPSHOT\tuscany-databinding-axiom-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6.1-SNAPSHOT\tuscany-distributed-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6.1-SNAPSHOT\tuscany-distributed-impl-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.6.1-SNAPSHOT\tuscany-extension-helper-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6.1-SNAPSHOT\tuscany-host-embedded-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6.1-SNAPSHOT\tuscany-host-http-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6.1-SNAPSHOT\tuscany-interface-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6.1-SNAPSHOT\tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6.1-SNAPSHOT\tuscany-interface-java-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6.1-SNAPSHOT\tuscany-interface-wsdl-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6.1-SNAPSHOT\tuscany-interface-wsdl-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6.1-SNAPSHOT\tuscany-policy-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6.1-SNAPSHOT\tuscany-policy-xml-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6.1-SNAPSHOT\tuscany-topology-1.6.1-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6.1-SNAPSHOT\tuscany-topology-xml-1.6.1-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/pom.xml
index f8e6dc6741..913e8f0013 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-samples</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-domain-webapp</artifactId>

@@ -39,50 +39,50 @@
         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

             

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>      

         

          <dependency>

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

             <artifactId>tuscany-domain-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

                                       

         <dependency>

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

             <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>   

         

          <dependency>

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

             <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-binding-http</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-implementation-resource</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>                 

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/pom.xml
index 64e3b5c7a6..d1646012c9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-feed-aggregator-webapp</artifactId>
@@ -40,25 +40,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 17bc07c0f5..ed0c5aee12 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-feed-aggregator-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/pom.xml
index 2f40606a96..c9d93a6c59 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-feed-aggregator</artifactId>
@@ -39,32 +39,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-bpel/pom.xml
index 27fbeb6749..231db75fe6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-bpel</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
                 
         <dependency>
@@ -191,7 +191,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.6.1-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/pom.xml
index c9b10dcad2..bc7f760fe3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-dojo-webapp</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 1013482148..cd99577116 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-dojo-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-reference/pom.xml
index c0a7704aa7..00d6de1590 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-reference-erlang</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-erlang-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-service/pom.xml
index c2fb2a867d..c2f3f81ddf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-erlang-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-service-erlang</artifactId>
@@ -39,21 +39,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-erlang-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/pom.xml
index b175d0b8ea..b885f9aff5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-jms-webapp</artifactId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 5f1e8ffa62..f5f359105f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-jms-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/pom.xml
index d2cfeebae5..0014e25950 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-jsonrpc-webapp</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 2f47467528..51be1eb502 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-jsonrpc-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/pom.xml
index 0fb6810baf..c3486b2ba7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-reference-jms</artifactId>

@@ -39,33 +39,33 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency> 

 

         <dependency>

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

             <artifactId>sample-helloworld-service-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/pom.xml
index c6de7a2bec..9e31c290d8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-service-jms</artifactId>

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

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
index cf19eec5cd..ef0a85281d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
@@ -56,43 +56,43 @@
              webxml="src/main/webapp/WEB-INF/web.xml">

             <fileset dir="src/main/webapp"/>       	

             <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-feed-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-jsonrpc-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-axis2-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-impl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-databinding-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-axiom-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-jaxb-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-sdo-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-distributed-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-extension-helper-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-embedded-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-http-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-webapp-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-runtime-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-runtime-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-xml-1.6.1-SNAPSHOT.jar"/>         	

+            	<include name="tuscany-policy-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-policy-xml-1.6.1-SNAPSHOT.jar"/>

             </zipfileset>

             <lib dir="${tuscany.sca.lib.location}">

             	<include name="XmlSchema-1.3.1.jar"/>

@@ -132,7 +132,7 @@
             	<include name="neethi-2.0.1.jar"/>

             	<include name="rome-0.9.jar"/>

             	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.6.1-SNAPSHOT.jar"/>

             	<include name="stax-api-1.0-2.jar"/>

             	<include name="stax-api-1.0.1.jar"/>

             	<include name="woden-1.0-incubating-M7a.jar"/>

@@ -141,9 +141,9 @@
             	<include name="xercesImpl-2.8.1.jar"/>

             	<include name="xml-apis-1.3.03.jar"/>

             	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.6-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-api-r2.1-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-impl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-lib-1.6.1-SNAPSHOT.jar"/>

             </lib>        	

             <classes dir="target/classes"/>

             <classes dir="target/sdo-source"/>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/pom.xml
index 0281b6f9a0..8dadbea865 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-helloworld-ws-service-webapp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/pom.xml
index 320d28aa5d..0ce0a3ef37 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-reference-jms</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-lean/pom.xml
index 32494cc508..4fa602a3b5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-lean/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-lean/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-ws-reference-lean</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-ws-service</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/pom.xml
index 52e3ef376d..0b848d6e8b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-ws-reference-secure</artifactId>

@@ -39,7 +39,7 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-ws-service-secure</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/pom.xml
index 8d910eae68..cba411ab56 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-reference</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/pom.xml
index 624665d864..04a7fa7b0e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-sdo-webapp</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     
         <dependency>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 -->        
@@ -193,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 08570705b0..1ccd626817 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-sdo-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/pom.xml
index e9f4a60d8c..5a5a0be543 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-sdo</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -80,14 +80,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/pom.xml
index a241d69006..64d7516d1f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-ws-service-jms</artifactId>

@@ -39,14 +39,14 @@
         <dependency>

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

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

@@ -65,14 +65,14 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>    

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/pom.xml
index e04aaa9bd0..4dba452551 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-ws-service-secure</artifactId>

@@ -39,7 +39,7 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
index 0a4be34c47..e420d3f4ab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
@@ -53,43 +53,43 @@
              webxml="src/main/webapp/WEB-INF/web.xml">

             <fileset dir="src/main/webapp"/>       	

             <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-feed-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-jsonrpc-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-axis2-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-impl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-databinding-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-axiom-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-jaxb-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-sdo-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-distributed-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-extension-helper-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-embedded-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-http-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-webapp-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-runtime-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-xml-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-runtime-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-xml-1.6.1-SNAPSHOT.jar"/>         	

+            	<include name="tuscany-policy-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-policy-xml-1.6.1-SNAPSHOT.jar"/>

             </zipfileset>

             <lib dir="${tuscany.sca.lib.location}">

             	<include name="XmlSchema-1.3.1.jar"/>

@@ -129,7 +129,7 @@
             	<include name="neethi-2.0.1.jar"/>

             	<include name="rome-0.9.jar"/>

             	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.6.1-SNAPSHOT.jar"/>

             	<include name="stax-api-1.0-2.jar"/>

             	<include name="stax-api-1.0.1.jar"/>

             	<include name="woden-1.0-incubating-M7a.jar"/>

@@ -138,9 +138,9 @@
             	<include name="xercesImpl-2.8.1.jar"/>

             	<include name="xml-apis-1.3.03.jar"/>

             	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.6-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-api-r2.1-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-impl-1.6.1-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-lib-1.6.1-SNAPSHOT.jar"/>

             </lib>        	

             <classes dir="target/classes"/>

             <classes dir="target/sdo-source"/>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/pom.xml
index 2399c4f29c..ec530f3c1c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>sample-helloworld-ws-service-webapp</artifactId>
     <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index dea8c1cb23..07f716fed8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-service-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.6.1-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/pom.xml
index 97b8ff27ab..aa807a9152 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-service</artifactId>
@@ -39,28 +39,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/pom.xml
index 09ccdc413b..0504eb7c59 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-holder-ws-service</artifactId>
@@ -39,28 +39,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/pom.xml
index b7bae958c8..a1a63ae19b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-composite</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/pom.xml
index ab2a3ff149..cb40299886 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-crud-extension</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/pom.xml
index c552472f21..422c505896 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-crud</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-implementation-crud-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/pom.xml
index 3cfc11707b..107e1021bc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/pom.xml
@@ -22,30 +22,30 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-implementation-notification</artifactId>

     <name>Apache Tuscany SCA Sample Notification Implementation</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.6.1-SNAPSHOT</version>

     <description>A sample illustrating use of implementation.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         <!-- end -->

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/pom.xml
index 3d5a47c4ff..5e1798b4a6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-pojo-extension</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/loanapplication/pom.xml
index 59ce010291..3cbb831560 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/loanapplication/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-loanapplication</artifactId>

@@ -39,13 +39,13 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/pom.xml
index 9893e92cc1..3b4d5e3cf4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-osgi-supplychain</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/pom.xml
index ebcc7cc035..b40e88c56a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-photo-gallery</artifactId>
@@ -39,68 +39,68 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml
index b9afe06e87..2706f84747 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/quote-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/quote-xquery/pom.xml
index 6d5aca6bcd..ddc95b6c2c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/quote-xquery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-quote-xquery</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -101,13 +101,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/pom.xml
index 21e2728b4c..db3b44327c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-bigbank-spring</artifactId>
@@ -39,26 +39,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -88,110 +88,110 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 	  <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-spring-bigbank-checkaccount</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/pom.xml
index 5b798039ba..3fe0f73073 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-bigbank</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/pom.xml
index 46896f4afd..5b4db0a456 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-callback-ws</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/pom.xml
index cfca4c2b21..db5e87a101 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-callback</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spi-implementation-pojo/pom.xml
index 4be056cea2..dffae31508 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spi-implementation-pojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-spi-implementation-java</artifactId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/pom.xml
index 7d2356113d..fc58e8cc73 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-spring-bigbank-calculator</artifactId>

@@ -39,48 +39,48 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-script</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/pom.xml
index 1e290535f9..3a25ac1a57 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-spring-bigbank-checkaccount</artifactId>

@@ -40,60 +40,60 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-security</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-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.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/pom.xml
index 1f57e4990d..789ede489f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-spring-bigbank-stockquote</artifactId>

@@ -39,48 +39,48 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-dojo/pom.xml
index 9dde6a5533..72b9ea5dee 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-dojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-dojo</artifactId>
@@ -39,75 +39,75 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/pom.xml
index 4b6f5c5ec5..5bd095d3df 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-secure</artifactId>
@@ -39,74 +39,74 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-webapp/pom.xml
index 8b6f0412f1..317e97691b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-webapp</artifactId>
@@ -40,47 +40,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store/pom.xml
index baa666dabd..c53adda230 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store</artifactId>
@@ -39,54 +39,54 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -94,14 +94,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/pom.xml
index 034940f3b3..1777aa37a8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-supplychain</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/pom.xml
index 5164c1f219..8c88de56cb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-web-resource</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/pom.xml
index 3aed3ff683..422a670b71 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-zipcode-jaxws</artifactId>
@@ -34,27 +34,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -124,7 +124,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/contrib2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/contrib2wsdl/pom.xml
index 4d388c1c2c..d5e2df8fcf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/contrib2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
index 8dfcc5c36b..02f9d147a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.tuscany.sca.feature.core"
       label="Apache Tuscany SCA Tools Core Feature"
-      version="1.6"
+      version="1.6.1-SNAPSHOT"
       provider-name="Apache Software Foundation">
    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
 
@@ -56,16 +56,16 @@ Unless required by applicable law or agreed to in writing, software distributed
          id="org.apache.tuscany.sca.core"
          download-size="0"
          install-size="0"
-         version="1.6"
+         version="1.6.1-SNAPSHOT"
          unpack="false"/>
 
    <data
-         id="runtime/apache-tuscany-sca-1.6-SNAPSHOT.jar"
+         id="runtime/apache-tuscany-sca-1.6.1-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.6.1-SNAPSHOT-src.zip"
          download-size="0"
          install-size="0"/>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
index 95e1b8039f..b752fbf38d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
index 9eee96833f..167e9b3c2a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
@@ -47,7 +47,7 @@ public class ClasspathUtil {
     private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";

 

     private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature.core";

-    private static final String TUSCANY_VERSION = "1.6";

+    private static final String TUSCANY_VERSION = "1.6.1-SNAPSHOT";

     

     /**

      * Return the installed runtime classpath entries.

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
index 48c3be12c8..5ed62280dc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.core</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml
index 4f5e2dc7b6..fa2049b587 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
index 45c021aa82..95069f0c57 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
index 9d83433882..e896946296 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
@@ -22,15 +22,15 @@
       Apache Tuscany SCA Tools.
    </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"/>
+   <feature id="org.apache.tuscany.sca.feature.core" version="1.6.1-SNAPSHOT"
+      url="features/org.apache.tuscany.sca.feature.core-1.6.1-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"/>
+   <archive path="plugins/org.apache.tuscany.sca.core_1.6.1-SNAPSHOT.jar"
+      url="plugins/org.apache.tuscany.sca.core-1.6.1-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.6.1-SNAPSHOT/runtime/apache-tuscany-sca-1.6.1-SNAPSHOT.jar"
+      url="../apache-tuscany-sca-1.6.1-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.6.1-SNAPSHOT/src/apache-tuscany-sca-1.6.1-SNAPSHOT-src.zip"
+      url="../apache-tuscany-sca-1.6.1-SNAPSHOT-src.zip"/>   
 </site>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/java2wsdl/pom.xml
index 0f2d66df1b..0d32efad42 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.stream</groupId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/pom.xml
index 6d40bb02c6..c7ada92f3a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-ant-generator</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-dependency-lister/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-dependency-lister/pom.xml
index f5bafa86f7..2c00a7ed05 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-dependency-lister/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-maven-dependency-lister</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-incremental-build/pom.xml
index 1553f3ff27..177c49bc76 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-incremental-build</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-java2wsdl/pom.xml
index cd04449c3b..51ea1cc808 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-osgi-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-osgi-junit/pom.xml
index 70c0ea0c5e..b432bf17aa 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-osgi-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-tuscany-bundle-plugin/pom.xml
index e693691399..6c3b90328d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-tuscany-bundle-plugin/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-bundle-plugin</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-wsdl2java/pom.xml
index 580b3214dd..9108aa549a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/pom.xml
index 077a486d06..83cf55ca68 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/pom.xml
index 320d78b1fa..746b51eaaf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-sca-tools</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/wsdl2java/pom.xml
index 42bf0c7162..ba2e40e4fe 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/pom.xml
index 7eb8714f1b..824d19a771 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-tutorials</artifactId>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
index 3f05db1c8e..3252816380 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-assets</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
index bc79145f00..d31f5ff5c4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-tutorial-store</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

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

     </parent>

 

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
index ab15e56bf0..0ddffd3f92 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-mediation</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
index b5031b0360..e9097f44fe 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-tutorial-store</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.6.1-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tutorial-catalog-webapp</artifactId>

@@ -40,27 +40,27 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tutorial-assets</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

         </dependency>

         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-launcher</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.6.1-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

@@ -95,7 +95,7 @@
             <plugin>

                 <groupId>org.apache.tuscany.sca</groupId>

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.6.1-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <configuration>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
index 32cdd49ed0..10738dd78a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-domain</artifactId>
@@ -39,138 +39,138 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -221,7 +221,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
index 36c7bf6d00..ea27cbacab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorials</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tutorial-store</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
index cecdaab79b..b1499a014b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-client</artifactId>
@@ -39,52 +39,52 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@@ -108,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
index e007c73a49..ae6c5f1012 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
index d76185d010..adac2185c8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
     </fileset>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
index 2e4e8d56ea..c86c6a8eb9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-enterprise</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
index 92ab93ea08..18f6ed5128 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-eu</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
index dc64e9500b..ebf9937f6c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
     </fileset>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
index a3fb62dfa4..bb7517963d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-market</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
index e936f0a9e3..e24295e804 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-mashup</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
index ab9fc41fa2..b1029cb4a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-merger</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
index 6c16395193..af4e2560f1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-supplier</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
index b8543a8ff1..f335e8e05c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-test</artifactId>
@@ -39,122 +39,122 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-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.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-store-supplier</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -200,7 +200,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
index 521ddf6c2e..15f4665ada 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
index b2a1387dab..318c662767 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
@@ -46,24 +46,24 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jms-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
-        <include name="tutorial-assets-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jms-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6.1-SNAPSHOT.jar"/>
+        <include name="tutorial-assets-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
         <include name="derby-10.3.1.4.jar"/>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
index 939d3b24bc..2753f300f7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-warehouse-spring</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
index beedfd27ff..0332220c19 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-web-services</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/component/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/component/pom.xml
index 718bda85e1..48dcdadbe2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/component/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/component/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly-component</artifactId>
@@ -33,26 +33,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/composite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/composite/pom.xml
index 692ee401f2..3ab2678b78 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly-composite</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/ctypefile/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/ctypefile/pom.xml
index f8f60ad3d4..3af68265e9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/ctypefile/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly-ctypefile</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/pom.xml
index 1dccc099f2..82e1b3cc80 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversational/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversational/pom.xml
index 50c30ffade..b042c81726 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversational/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversational/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-conversation</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversationattributes/pom.xml
index a71b1d17f1..bd509aaa37 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/conversationattributes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-conversationattributes</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/destroy/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/destroy/pom.xml
index 5bfc172687..7733f4322b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/destroy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/destroy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-destroy</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/endsconversation/pom.xml
index eca15df762..a1d2b4de52 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/endsconversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-endsconversation</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/init/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/init/pom.xml
index 842c41b144..955143e393 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/init/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/init/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-init</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/oneway/pom.xml
index d1408372f3..7ed1ef08fe 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/oneway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-oneway</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/pom.xml
index f2cb612b2e..ad44bfab7d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>java-api-annotations</artifactId>
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/property/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/property/pom.xml
index 896a6b48c8..00369c2df8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/property/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/property/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-property</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/reference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/reference/pom.xml
index b4bea7a1c8..91c827c09e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-reference</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/scope/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/scope/pom.xml
index 7298c17413..03e142eb86 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/scope/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/scope/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-scope</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/service/pom.xml
index 2c1d185f22..46e9210e59 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/annotations/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-service</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/callablereference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/callablereference/pom.xml
index 161eed1f83..18867801ed 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/callablereference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/callablereference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-callablereference</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/componentcontext/pom.xml
index a798bc18da..5f96970772 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/componentcontext/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/componentcontext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-componentcontext</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/conversation/pom.xml
index 4afdaae33a..9b3d35ae6e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-conversation</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/exception/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/exception/pom.xml
index 4961e5fa85..3397b817fe 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/exception/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/exception/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-exception</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/pom.xml
index 570dbef27c..0293140ad9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>java-api-apis</artifactId>
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/requestcontext/pom.xml
index 33c129b042..52c5705836 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/requestcontext/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/requestcontext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-requestcontext</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/servicereference/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/servicereference/pom.xml
index 6ef6a5b4bf..99b1167075 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/servicereference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/apis/servicereference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-apis</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-apis-servicereference</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callback/pom.xml
index 27af25fc9a..d6d8ba3dae 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation-callback</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callbackmixed/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callbackmixed/pom.xml
index 0281b8fd26..da8d9283f7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callbackmixed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/callbackmixed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation-callback-mixed</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/id/pom.xml
index 854d55d15c..03f6251faf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/id/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/id/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation-id</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/lifetime/pom.xml
index 6ee5a6ed9d..116667b55c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/lifetime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/lifetime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation-lifetime</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/parameters/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/parameters/pom.xml
index f1dd1b4e0f..0a0626ad44 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/parameters/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/parameters/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation-parameters</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/pom.xml
index 7d98b95e5f..f977e8d4bf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-conversation</artifactId>
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/pom.xml
index af3f58dea2..852a00b354 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/java-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/pom.xml
index 3e1f5d07c0..c1db18ad85 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-vtest</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/utilities/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/utilities/pom.xml
index f738f70274..63ff262c01 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/utilities/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/utilities/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-utilities</artifactId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
index 5ee0fe64bd..bc3ee7caf4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-nowsdl-defaultbinding</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
index 3d9fe41834..1ae22d8bed 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-nowsdl-multisoapbindings</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/pom.xml
index a5ab0eda88..b755d51339 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-nowsdl</artifactId>
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/promoted/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/promoted/pom.xml
index 07321d5f2c..713a067202 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/promoted/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-nowsdl-promoted</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/soapversion/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/soapversion/pom.xml
index 12cc40dacd..8a47fc07bb 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/nowsdl/soapversion/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-nowsdl-soapversion</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/pom.xml
index e5051e49b2..e46dd97102 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/service/pom.xml
index 40f2bc5bc1..3e69809ecd 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-service</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/binding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/binding/pom.xml
index 2e5a8fc018..40bfe5b92c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/binding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-wsdlelement-binding</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/pom.xml
index e730234f3c..1d546a9a81 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-wsdlelement</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/port/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/port/pom.xml
index 100d77d63f..a20c95e551 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/port/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/port/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-wsdlelement-port</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/service/pom.xml
index d7a0332caa..ca90aaf549 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/vtest/wsbinding/wsdlelement/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-wsbinding-wsdlelement-service</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>