Change trunk version so it doesn't clash with the 1.4 branch version by bumping up to 2.0-SNAPSHOT as per the recent vote for 2.0

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

460 files changed, 5966 insertions, 5966 deletions

diff --git a/java/sca/demos/alert-aggregator-webapp/pom.xml b/java/sca/demos/alert-aggregator-webapp/pom.xml
index 71c59ae984..71139b0863 100644
--- a/java/sca/demos/alert-aggregator-webapp/pom.xml
+++ b/java/sca/demos/alert-aggregator-webapp/pom.xml
@@ -24,14 +24,14 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>demo-alert-aggregator-webapp</artifactId>
     <packaging>war</packaging>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>Apache Tuscany SCA Alert Aggregator Demo</name>
     <url>http://cwiki.apache.org/TUSCANY</url>
 
@@ -109,24 +109,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
@@ -327,7 +327,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 6126c01eb3..bd31898e3b 100644
--- a/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-2622 -->
diff --git a/java/sca/demos/bigbank-account/pom.xml b/java/sca/demos/bigbank-account/pom.xml
index 1455b45684..12421e3788 100644
--- a/java/sca/demos/bigbank-account/pom.xml
+++ b/java/sca/demos/bigbank-account/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/demos/bigbank-calculator/pom.xml b/java/sca/demos/bigbank-calculator/pom.xml
index 744853dd00..982fdb7e2a 100644
--- a/java/sca/demos/bigbank-calculator/pom.xml
+++ b/java/sca/demos/bigbank-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/demos/bigbank-stockquote/pom.xml b/java/sca/demos/bigbank-stockquote/pom.xml
index edd0aa247b..97586917cc 100644
--- a/java/sca/demos/bigbank-stockquote/pom.xml
+++ b/java/sca/demos/bigbank-stockquote/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/demos/bigbank/pom.xml b/java/sca/demos/bigbank/pom.xml
index a598ec617e..d9946b0a09 100644
--- a/java/sca/demos/bigbank/pom.xml
+++ b/java/sca/demos/bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -58,69 +58,69 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>demo-bigbank-account</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/demos/load-balancing-webapp/pom.xml b/java/sca/demos/load-balancing-webapp/pom.xml
index 84e693e59e..cdd6727460 100644
--- a/java/sca/demos/load-balancing-webapp/pom.xml
+++ b/java/sca/demos/load-balancing-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-load-balancing-webapp</artifactId>
@@ -34,33 +34,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
@@ -242,7 +242,7 @@
            <!--plugin>
                <groupId>org.apache.tuscany.sca</groupId>
                <artifactId>tuscany-maven-web-junit</artifactId>
-               <version>1.4-SNAPSHOT</version>
+               <version>2.0-SNAPSHOT</version>
                <executions>
                    <execution>
                        <id>generate-web-xml</id>
diff --git a/java/sca/demos/mortgage-creditcheck/pom.xml b/java/sca/demos/mortgage-creditcheck/pom.xml
index 44d27b6d2c..a5e268812b 100644
--- a/java/sca/demos/mortgage-creditcheck/pom.xml
+++ b/java/sca/demos/mortgage-creditcheck/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/demos/mortgage-loanapproval/pom.xml b/java/sca/demos/mortgage-loanapproval/pom.xml
index 783dd05672..2947a59ee9 100644
--- a/java/sca/demos/mortgage-loanapproval/pom.xml
+++ b/java/sca/demos/mortgage-loanapproval/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-mortgage-loanapproval</artifactId>
@@ -38,26 +38,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/demos/pom.xml b/java/sca/demos/pom.xml
index 420ad92c52..9ada7dba1e 100644
--- a/java/sca/demos/pom.xml
+++ b/java/sca/demos/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-demos</artifactId>
diff --git a/java/sca/demos/workpool-distributed/pom.xml b/java/sca/demos/workpool-distributed/pom.xml
index 01a8900d52..6d441bdfaf 100644
--- a/java/sca/demos/workpool-distributed/pom.xml
+++ b/java/sca/demos/workpool-distributed/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-sca</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>demo-workpool-distributed</artifactId>
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -74,62 +74,62 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-node-impl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-domain-impl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca-axis2</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-http-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-job</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-contribution-updater</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-xstream</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-resource-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-tomcat</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/java/sca/demos/xml-bigbank/pom.xml b/java/sca/demos/xml-bigbank/pom.xml
index dfa93a2f82..0dc535352b 100644
--- a/java/sca/demos/xml-bigbank/pom.xml
+++ b/java/sca/demos/xml-bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-demos</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -69,14 +69,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/distribution/bundle-minimal/pom.xml b/java/sca/distribution/bundle-minimal/pom.xml
index 4fec6013a5..95e017c3e9 100644
--- a/java/sca/distribution/bundle-minimal/pom.xml
+++ b/java/sca/distribution/bundle-minimal/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

diff --git a/java/sca/distribution/bundle/pom.xml b/java/sca/distribution/bundle/pom.xml
index cd9c147204..f83f8f9d1c 100644
--- a/java/sca/distribution/bundle/pom.xml
+++ b/java/sca/distribution/bundle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index e720a2e331..51d51ba3a8 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -1,240 +1,240 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-all</artifactId>
-    <name>Apache Tuscany SCA All-in-one Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-ant-generator</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-java2wsdl</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-wsdl2java</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-incremental-build</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-all</artifactId>

+    <name>Apache Tuscany SCA All-in-one Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-distribution-ejava</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-distribution-process</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-distribution-web20</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-distribution-webservice</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-maven-ant-generator</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-maven-java2wsdl</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-maven-wsdl2java</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-maven-incremental-build</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+    </dependencies>

+

+    <profiles>

+    

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>    

+

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-atom</module>

+                <module>../../../modules/binding-atom-abdera</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-ejb</module>

+                <module>../../../modules/binding-ejb-runtime</module>

+                <module>../../../modules/binding-http</module>

+                <module>../../../modules/binding-http-runtime</module>

+                <module>../../../modules/binding-jms</module>

+                <module>../../../modules/binding-jms-runtime</module>

+                <module>../../../modules/binding-jsonrpc</module>

+                <module>../../../modules/binding-jsonrpc-runtime</module>

+                <module>../../../modules/binding-rss</module>

+                <module>../../../modules/binding-rss-rome</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-axis2</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/binding-ws</module>

+                <module>../../../modules/binding-ws-axis2</module>

+                <module>../../../modules/binding-ws-wsdlgen</module>

+                <module>../../../modules/binding-ws-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-resource</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-axiom</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-jaxb-axiom</module>

+                <module>../../../modules/databinding-json</module>

+                <module>../../../modules/databinding-saxon</module>

+                <module>../../../modules/databinding-sdo</module>

+                <module>../../../modules/databinding-sdo-axiom</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/domain-manager</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/extension-helper</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-ejb</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-bpel</module>

+                <module>../../../modules/implementation-bpel-ode</module>

+                <module>../../../modules/implementation-ejb</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-resource</module>

+                <module>../../../modules/implementation-resource-runtime</module>

+                <module>../../../modules/implementation-script</module>

+                <module>../../../modules/implementation-spring</module>

+                <module>../../../modules/implementation-widget</module>

+                <module>../../../modules/implementation-widget-runtime</module>

+                <module>../../../modules/implementation-xquery</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/node-manager</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-security-ws</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/policy-xml-ws</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/workspace</module>

+                <module>../../../modules/workspace-impl</module>

+                <module>../../../modules/workspace-xml</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml
index 53f01acf49..6cf324c889 100644
--- a/java/sca/distribution/features/core/pom.xml
+++ b/java/sca/distribution/features/core/pom.xml
@@ -1,340 +1,340 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-core</artifactId>
-    <name>Apache Tuscany SCA Core Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Assembly model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Corba binding -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Core runtime -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Data API -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Policy definitions -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Domain support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Core Extensibility -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <!--  Corba host -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation types -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Interface models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Node runtime -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>war</type>
-        </dependency>
-
-        <!-- Monitoring -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <!-- Policy models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- SCA API -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- XMLSchema support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-core</artifactId>

+    <name>Apache Tuscany SCA Core Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Assembly model -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-assembly-xsd</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Corba binding -->

+        <dependency>

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

+            <artifactId>tuscany-binding-corba-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Contribution model -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-contribution-java</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-contribution-namespace</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Core runtime -->

+        <dependency>

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

+            <artifactId>tuscany-core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-core-spi</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Databindings -->

+        <dependency>

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

+            <artifactId>tuscany-databinding</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-databinding-jaxb</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Data API -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Policy definitions -->

+        <dependency>

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

+            <artifactId>tuscany-definitions-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Domain support -->

+        <dependency>

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

+            <artifactId>tuscany-endpoint</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Core Extensibility -->

+        <dependency>

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

+            <artifactId>tuscany-extensibility</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-extensibility-equinox</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        

+        <!--  Corba host -->

+        <dependency>

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

+            <artifactId>tuscany-host-corba-jse</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Implementation types -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Interface models -->

+        <dependency>

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

+            <artifactId>tuscany-interface-java-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-java-jaxws</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-wsdl-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Node runtime -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <type>war</type>

+        </dependency>

+

+        <!-- Monitoring -->

+        <dependency>

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

+            <artifactId>tuscany-monitor</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-monitor-logging</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        

+        <!-- Policy models -->

+        <dependency>

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

+            <artifactId>tuscany-policy</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- SCA API -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- XMLSchema support -->

+        <dependency>

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

+            <artifactId>tuscany-xsd</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-xsd-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index 1ff6baa336..a926209a6a 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -1,179 +1,179 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementations -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-ejava</artifactId>

+    <name>Apache Tuscany SCA JEE Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Bindings -->

+        <dependency>

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

+            <artifactId>tuscany-binding-ejb-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jms-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Hosts -->

+        <dependency>

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

+            <artifactId>tuscany-host-ejb</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Implementations -->

+        <dependency>

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

+            <artifactId>tuscany-implementation-ejb</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-spring</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-ejb</module>

+                <module>../../../modules/binding-ejb-runtime</module>

+                <module>../../../modules/binding-jms</module>

+                <module>../../../modules/binding-jms-runtime</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-axiom</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/extension-helper</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-ejb</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/implementation-ejb</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-script</module>

+                <module>../../../modules/implementation-spring</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index cc594256c9..3d7bfe9bd4 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -1,259 +1,259 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-    
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Binding Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Domain support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

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

+    <name>Apache Tuscany SCA Domain Manager Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+    

+        <!-- Core distribution -->

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Binding Models -->

+        <dependency>

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

+            <artifactId>tuscany-binding-atom</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-ejb</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-http</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jsonrpc</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-rss</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Contribution models -->

+        <dependency>

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

+            <artifactId>tuscany-contribution-java</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-contribution-namespace</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-contribution-resource</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Domain support -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Implementation Models -->

+        <dependency>

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

+            <artifactId>tuscany-implementation-bpel</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-ejb</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-resource</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-widget</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-atom</module>

+                <module>../../../modules/binding-atom-abdera</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-ejb</module>

+                <module>../../../modules/binding-http</module>

+                <module>../../../modules/binding-http-runtime</module>

+                <module>../../../modules/binding-jsonrpc</module>

+                <module>../../../modules/binding-rss</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/binding-ws</module>

+                <module>../../../modules/binding-ws-wsdlgen</module>

+                <module>../../../modules/binding-ws-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-resource</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/domain-manager</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-bpel</module>

+                <module>../../../modules/implementation-ejb</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-resource</module>

+                <module>../../../modules/implementation-widget</module>

+                <module>../../../modules/implementation-widget-runtime</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/node-manager</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-security-ws</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/workspace</module>

+                <module>../../../modules/workspace-impl</module>

+                <module>../../../modules/workspace-xml</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/pom.xml b/java/sca/distribution/features/pom.xml
index 15cb996980..2acd155a97 100644
--- a/java/sca/distribution/features/pom.xml
+++ b/java/sca/distribution/features/pom.xml
@@ -1,44 +1,44 @@
-<?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-sca</artifactId>
-        <relativePath>../../pom.xml</relativePath>
-        <version>1.4-SNAPSHOT</version>
-    </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-distribution-features</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Feature Distributions</name>
-
-    <modules>
-        <module>all</module>
-        <module>core</module>
-        <module>ejava</module>
-        <module>repository</module>
-        <module>manager</module>
-        <module>process</module>
-        <module>web20</module>
-        <module>webservice</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>tuscany-sca</artifactId>

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

+        <version>2.0-SNAPSHOT</version>

+    </parent>

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

+    <artifactId>tuscany-distribution-features</artifactId>

+    <packaging>pom</packaging>

+    <name>Apache Tuscany SCA Feature Distributions</name>

+

+    <modules>

+        <module>all</module>

+        <module>core</module>

+        <module>ejava</module>

+        <module>repository</module>

+        <module>manager</module>

+        <module>process</module>

+        <module>web20</module>

+        <module>webservice</module>

+    </modules>

+

+</project>

diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index 4310034a0f..2b058cadbf 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -1,155 +1,155 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-process</artifactId>
-    <name>Apache Tuscany SCA Business Process Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementations -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-process</artifactId>

+    <name>Apache Tuscany SCA Business Process Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Implementations -->

+        <dependency>

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

+            <artifactId>tuscany-implementation-bpel-ode</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-implementation-xquery</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-saxon</module>

+                <module>../../../modules/databinding-sdo</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/implementation-bpel</module>

+                <module>../../../modules/implementation-bpel-ode</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-xquery</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/repository/pom.xml b/java/sca/distribution/features/repository/pom.xml
index cfee564971..aaf96f99b1 100644
--- a/java/sca/distribution/features/repository/pom.xml
+++ b/java/sca/distribution/features/repository/pom.xml
@@ -1,180 +1,180 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-repository</artifactId>
-    <name>Apache Tuscany SCA Maven Repository Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-all</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/repository.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-repository</artifactId>

+    <name>Apache Tuscany SCA Maven Repository Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-all</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+    

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/repository.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>    

+

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-atom</module>

+                <module>../../../modules/binding-atom-abdera</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-ejb</module>

+                <module>../../../modules/binding-ejb-runtime</module>

+                <module>../../../modules/binding-http</module>

+                <module>../../../modules/binding-http-runtime</module>

+                <module>../../../modules/binding-jms</module>

+                <module>../../../modules/binding-jms-runtime</module>

+                <module>../../../modules/binding-jsonrpc</module>

+                <module>../../../modules/binding-jsonrpc-runtime</module>

+                <module>../../../modules/binding-rss</module>

+                <module>../../../modules/binding-rss-rome</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-axis2</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/binding-ws</module>

+                <module>../../../modules/binding-ws-axis2</module>

+                <module>../../../modules/binding-ws-wsdlgen</module>

+                <module>../../../modules/binding-ws-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-resource</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-axiom</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-jaxb-axiom</module>

+                <module>../../../modules/databinding-json</module>

+                <module>../../../modules/databinding-saxon</module>

+                <module>../../../modules/databinding-sdo</module>

+                <module>../../../modules/databinding-sdo-axiom</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/domain-manager</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/extension-helper</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-ejb</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-bpel</module>

+                <module>../../../modules/implementation-bpel-ode</module>

+                <module>../../../modules/implementation-ejb</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-resource</module>

+                <module>../../../modules/implementation-resource-runtime</module>

+                <module>../../../modules/implementation-script</module>

+                <module>../../../modules/implementation-spring</module>

+                <module>../../../modules/implementation-widget</module>

+                <module>../../../modules/implementation-widget-runtime</module>

+                <module>../../../modules/implementation-xquery</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/node-manager</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-security-ws</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/policy-xml-ws</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/workspace</module>

+                <module>../../../modules/workspace-impl</module>

+                <module>../../../modules/workspace-xml</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index 58fe78edd4..e2f141f206 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -1,208 +1,208 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-web20</artifactId>
-    <name>Apache Tuscany SCA Web 2.0 Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation types -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-web20</artifactId>

+    <name>Apache Tuscany SCA Web 2.0 Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Bindings -->

+        <dependency>

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

+            <artifactId>tuscany-binding-atom-abdera</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-http-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-binding-rss-rome</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Contribution model -->

+        <dependency>

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

+            <artifactId>tuscany-contribution-resource</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Databindings -->

+        <dependency>

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

+            <artifactId>tuscany-databinding-json</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Hosts -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Implementation types -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-atom</module>

+                <module>../../../modules/binding-atom-abdera</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-http</module>

+                <module>../../../modules/binding-http-runtime</module>

+                <module>../../../modules/binding-jsonrpc</module>

+                <module>../../../modules/binding-jsonrpc-runtime</module>

+                <module>../../../modules/binding-rss</module>

+                <module>../../../modules/binding-rss-rome</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-resource</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-json</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/implementation-resource</module>

+                <module>../../../modules/implementation-resource-runtime</module>

+                <module>../../../modules/implementation-widget</module>

+                <module>../../../modules/implementation-widget-runtime</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 3edf5290b3..c1ff9080c3 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -1,230 +1,230 @@
-<?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-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>addressing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-adb-codegen</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>opensaml</groupId>
-                    <artifactId>opensaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Policy models -->
-        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-axis2-policy</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-distribution-features</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+

+    <artifactId>tuscany-distribution-webservice</artifactId>

+    <name>Apache Tuscany SCA Web Service Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Bindings -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.ant</groupId>

+                    <artifactId>ant-nodeps</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>addressing</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>axis2-xmlbeans</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>axis2-adb-codegen</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>bouncycastle</groupId>

+                    <artifactId>bcprov-jdk15</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>opensaml</groupId>

+                    <artifactId>opensaml</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <!-- Databindings -->

+        <dependency>

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

+            <artifactId>tuscany-databinding-axiom</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-databinding-sdo</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-databinding-sdo-axiom</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Hosts -->

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Policy models -->

+        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency-->

+        <dependency>

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

+            <artifactId>tuscany-policy-xml-ws</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

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

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-axis2</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/binding-ws</module>

+                <module>../../../modules/binding-ws-axis2</module>

+                <module>../../../modules/binding-ws-axis2-policy</module>

+                <module>../../../modules/binding-ws-wsdlgen</module>

+                <module>../../../modules/binding-ws-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-axiom</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-jaxb-axiom</module>

+                <module>../../../modules/databinding-sdo</module>

+                <module>../../../modules/databinding-sdo-axiom</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/monitor-logging</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-security-ws</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/policy-xml-ws</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/manifest/pom.xml b/java/sca/distribution/manifest/pom.xml
index 95fef9ca10..320dcc2151 100644
--- a/java/sca/distribution/manifest/pom.xml
+++ b/java/sca/distribution/manifest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml
index f092b2ee3e..d7e9a46930 100644
--- a/java/sca/distribution/pom.xml
+++ b/java/sca/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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  -->
@@ -109,7 +109,7 @@
         <!-- dependency> 
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency -->
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
diff --git a/java/sca/distribution/standalone/pom.xml b/java/sca/distribution/standalone/pom.xml
index 1cea366020..83cf69211e 100644
--- a/java/sca/distribution/standalone/pom.xml
+++ b/java/sca/distribution/standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/tomcat/pom.xml b/java/sca/distribution/tomcat/pom.xml
index 50259c299e..83d4884d6d 100644
--- a/java/sca/distribution/tomcat/pom.xml
+++ b/java/sca/distribution/tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/war/pom.xml b/java/sca/distribution/war/pom.xml
index 4d280b2f26..08c2687e20 100644
--- a/java/sca/distribution/war/pom.xml
+++ b/java/sca/distribution/war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/webapp/pom.xml b/java/sca/distribution/webapp/pom.xml
index b78b81fc84..6745a87c60 100644
--- a/java/sca/distribution/webapp/pom.xml
+++ b/java/sca/distribution/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/itest/admin/pom.xml b/java/sca/itest/admin/pom.xml
index 52a7bfb90a..e179926bf1 100644
--- a/java/sca/itest/admin/pom.xml
+++ b/java/sca/itest/admin/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-itest-admin</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/itest/binding-sca-jms/client/pom.xml b/java/sca/itest/binding-sca-jms/client/pom.xml
index 9119be6ad6..2e24179309 100644
--- a/java/sca/itest/binding-sca-jms/client/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/binding-sca-jms/pom.xml b/java/sca/itest/binding-sca-jms/pom.xml
index 2a706dd404..9da74604f5 100644
--- a/java/sca/itest/binding-sca-jms/pom.xml
+++ b/java/sca/itest/binding-sca-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

diff --git a/java/sca/itest/binding-sca-jms/service/pom.xml b/java/sca/itest/binding-sca-jms/service/pom.xml
index f57827b66d..5b0677b0e6 100644
--- a/java/sca/itest/binding-sca-jms/service/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/bpel/helloworld-reference/pom.xml b/java/sca/itest/bpel/helloworld-reference/pom.xml
index 6d922c709d..954f7c7ef9 100644
--- a/java/sca/itest/bpel/helloworld-reference/pom.xml
+++ b/java/sca/itest/bpel/helloworld-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -187,7 +187,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/bpel/helloworld-ws/pom.xml b/java/sca/itest/bpel/helloworld-ws/pom.xml
index 8efa769357..21637ca7c8 100644
--- a/java/sca/itest/bpel/helloworld-ws/pom.xml
+++ b/java/sca/itest/bpel/helloworld-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 		
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 				        
@@ -154,7 +154,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/bpel/helloworld/pom.xml b/java/sca/itest/bpel/helloworld/pom.xml
index dbabb8a283..9eae937361 100644
--- a/java/sca/itest/bpel/helloworld/pom.xml
+++ b/java/sca/itest/bpel/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -140,7 +140,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/bpel/pom.xml b/java/sca/itest/bpel/pom.xml
index 7168e27f98..d6909735db 100644
--- a/java/sca/itest/bpel/pom.xml
+++ b/java/sca/itest/bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel</artifactId>
diff --git a/java/sca/itest/builder/pom.xml b/java/sca/itest/builder/pom.xml
index 5eda64fdd8..257f6074e5 100644
--- a/java/sca/itest/builder/pom.xml
+++ b/java/sca/itest/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-monitor-logging</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>  

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>  

         

         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/itest/callablereferences-ws/pom.xml b/java/sca/itest/callablereferences-ws/pom.xml
index bd373b2ae6..53c503a911 100644
--- a/java/sca/itest/callablereferences-ws/pom.xml
+++ b/java/sca/itest/callablereferences-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/itest/callablereferences/pom.xml b/java/sca/itest/callablereferences/pom.xml
index 323ee9c076..51560bab07 100644
--- a/java/sca/itest/callablereferences/pom.xml
+++ b/java/sca/itest/callablereferences/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -52,14 +52,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
 -->        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-api/pom.xml b/java/sca/itest/callback-api/pom.xml
index 0175bef27f..65d641daae 100644
--- a/java/sca/itest/callback-api/pom.xml
+++ b/java/sca/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-basic/pom.xml b/java/sca/itest/callback-basic/pom.xml
index 1108a4ce37..eb9e619596 100644
--- a/java/sca/itest/callback-basic/pom.xml
+++ b/java/sca/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-complex-type/pom.xml b/java/sca/itest/callback-complex-type/pom.xml
index 371b72242d..084e55d694 100644
--- a/java/sca/itest/callback-complex-type/pom.xml
+++ b/java/sca/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-id/pom.xml b/java/sca/itest/callback-id/pom.xml
index e8da0dfc2c..3eedfe0fc9 100644
--- a/java/sca/itest/callback-id/pom.xml
+++ b/java/sca/itest/callback-id/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-multiple-wires/pom.xml b/java/sca/itest/callback-multiple-wires/pom.xml
index 43fc9e2ec3..c9602bfaa0 100644
--- a/java/sca/itest/callback-multiple-wires/pom.xml
+++ b/java/sca/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-separatethread/pom.xml b/java/sca/itest/callback-separatethread/pom.xml
index 7cfc5ce992..4ba2834ba8 100644
--- a/java/sca/itest/callback-separatethread/pom.xml
+++ b/java/sca/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-set-callback/pom.xml b/java/sca/itest/callback-set-callback/pom.xml
index a9883a4253..887213e392 100644
--- a/java/sca/itest/callback-set-callback/pom.xml
+++ b/java/sca/itest/callback-set-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/callback-set-conversation/pom.xml b/java/sca/itest/callback-set-conversation/pom.xml
index 23fa07b2ae..bbb64a0b5d 100644
--- a/java/sca/itest/callback-set-conversation/pom.xml
+++ b/java/sca/itest/callback-set-conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/component-type/pom.xml b/java/sca/itest/component-type/pom.xml
index 33a735a418..bc6dd696e1 100644
--- a/java/sca/itest/component-type/pom.xml
+++ b/java/sca/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/contribution-classloader/contribution-classes/pom.xml b/java/sca/itest/contribution-classloader/contribution-classes/pom.xml
index f74b493c8e..55076f0f5e 100644
--- a/java/sca/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/java/sca/itest/contribution-classloader/contribution-classes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/contribution-classloader/contribution-test/pom.xml b/java/sca/itest/contribution-classloader/contribution-test/pom.xml
index b417012edd..ce3ca3c55e 100644
--- a/java/sca/itest/contribution-classloader/contribution-test/pom.xml
+++ b/java/sca/itest/contribution-classloader/contribution-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/java/sca/itest/contribution-classloader/pom.xml b/java/sca/itest/contribution-classloader/pom.xml
index 4007f0115c..7e94f897b8 100644
--- a/java/sca/itest/contribution-classloader/pom.xml
+++ b/java/sca/itest/contribution-classloader/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/java/sca/itest/contribution-import-export/export-composite/pom.xml b/java/sca/itest/contribution-import-export/export-composite/pom.xml
index 2e21138924..5c06625055 100644
--- a/java/sca/itest/contribution-import-export/export-composite/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/contribution-import-export/export-java/pom.xml b/java/sca/itest/contribution-import-export/export-java/pom.xml
index f598a23b21..e65f8bf0d5 100644
--- a/java/sca/itest/contribution-import-export/export-java/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/contribution-import-export/export-resource/pom.xml b/java/sca/itest/contribution-import-export/export-resource/pom.xml
index ed399193df..1202328b00 100644
--- a/java/sca/itest/contribution-import-export/export-resource/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-export-resource</artifactId>
diff --git a/java/sca/itest/contribution-import-export/export-wsdl/pom.xml b/java/sca/itest/contribution-import-export/export-wsdl/pom.xml
index af619849ea..51f9efd932 100644
--- a/java/sca/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

diff --git a/java/sca/itest/contribution-import-export/import-composite/pom.xml b/java/sca/itest/contribution-import-export/import-composite/pom.xml
index cc2cf4161e..43abc021e3 100644
--- a/java/sca/itest/contribution-import-export/import-composite/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/contribution-import-export/import-java/pom.xml b/java/sca/itest/contribution-import-export/import-java/pom.xml
index 933b00491c..f53de2c85b 100644
--- a/java/sca/itest/contribution-import-export/import-java/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/contribution-import-export/import-resource/pom.xml b/java/sca/itest/contribution-import-export/import-resource/pom.xml
index 993e0b368a..32fe573123 100644
--- a/java/sca/itest/contribution-import-export/import-resource/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/pom.xml b/java/sca/itest/contribution-import-export/import-wsdl/pom.xml
index 9badb50dc7..d7eadbccd3 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/contribution-import-export/pom.xml b/java/sca/itest/contribution-import-export/pom.xml
index 070263ea32..36858e953e 100644
--- a/java/sca/itest/contribution-import-export/pom.xml
+++ b/java/sca/itest/contribution-import-export/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 </project>

diff --git a/java/sca/itest/contribution-multiple/pom.xml b/java/sca/itest/contribution-multiple/pom.xml
index a87e983bb3..5ff78b3d48 100644
--- a/java/sca/itest/contribution-multiple/pom.xml
+++ b/java/sca/itest/contribution-multiple/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
     </dependencies>
diff --git a/java/sca/itest/contribution/pom.xml b/java/sca/itest/contribution/pom.xml
index 6b2f0e7cef..1fe5207ad5 100644
--- a/java/sca/itest/contribution/pom.xml
+++ b/java/sca/itest/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

     </dependencies>

diff --git a/java/sca/itest/conversations-ws/pom.xml b/java/sca/itest/conversations-ws/pom.xml
index 87827c86dd..6b0fab3c8f 100644
--- a/java/sca/itest/conversations-ws/pom.xml
+++ b/java/sca/itest/conversations-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/itest/conversations/pom.xml b/java/sca/itest/conversations/pom.xml
index 68e771f2d4..e4123f0158 100644
--- a/java/sca/itest/conversations/pom.xml
+++ b/java/sca/itest/conversations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/corba/pom.xml b/java/sca/itest/corba/pom.xml
index b7b7f26b22..f1dd2a9187 100644
--- a/java/sca/itest/corba/pom.xml
+++ b/java/sca/itest/corba/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-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.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca-corba</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -98,14 +98,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/java/sca/itest/databindings/common/pom.xml b/java/sca/itest/databindings/common/pom.xml
index 40f2999c9c..661b264a49 100644
--- a/java/sca/itest/databindings/common/pom.xml
+++ b/java/sca/itest/databindings/common/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-common</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA Databinding Common Integration Tests</name>
 
diff --git a/java/sca/itest/databindings/interop/pom.xml b/java/sca/itest/databindings/interop/pom.xml
index bcd1b12078..a8f7635183 100644
--- a/java/sca/itest/databindings/interop/pom.xml
+++ b/java/sca/itest/databindings/interop/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-interop</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA DataBinding Interop Integration Tests</name>
 
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/pom.xml b/java/sca/itest/databindings/jaxb-bottom-up/pom.xml
index 92a8e7d82a..45e5720602 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/java/sca/itest/databindings/jaxb-bottom-up/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA Databinding Integration Tests - JAXB Bottom Up</name>
 
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/java/sca/itest/databindings/jaxb-top-down/pom.xml b/java/sca/itest/databindings/jaxb-top-down/pom.xml
index ae506499d4..4e3fcfbe5c 100644
--- a/java/sca/itest/databindings/jaxb-top-down/pom.xml
+++ b/java/sca/itest/databindings/jaxb-top-down/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-top-down</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA Databinding Integration Tests - JAXB Top Down</name>
 
@@ -63,60 +63,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-databindings-common</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency-->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/java/sca/itest/databindings/jaxbgen/pom.xml b/java/sca/itest/databindings/jaxbgen/pom.xml
index 648c16bf75..fb88bcfff1 100644
--- a/java/sca/itest/databindings/jaxbgen/pom.xml
+++ b/java/sca/itest/databindings/jaxbgen/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA JAXB Databinding Integration Tests</name>
 
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/java/sca/itest/databindings/pom.xml b/java/sca/itest/databindings/pom.xml
index e607d4a6a5..43f99aff39 100644
--- a/java/sca/itest/databindings/pom.xml
+++ b/java/sca/itest/databindings/pom.xml
@@ -21,7 +21,7 @@
   <parent>
       <groupId>org.apache.tuscany.sca</groupId>
       <artifactId>tuscany-itest</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>2.0-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.4-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   
   
   <packaging>pom</packaging>
diff --git a/java/sca/itest/databindings/sdogen/pom.xml b/java/sca/itest/databindings/sdogen/pom.xml
index bfafd558f8..e8a27753cf 100644
--- a/java/sca/itest/databindings/sdogen/pom.xml
+++ b/java/sca/itest/databindings/sdogen/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-sdo</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCA SDO Databinding Integration Tests</name>
 
diff --git a/java/sca/itest/domain/pom.xml b/java/sca/itest/domain/pom.xml
index 45ce8c1081..b1fe80ff47 100644
--- a/java/sca/itest/domain/pom.xml
+++ b/java/sca/itest/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>    

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>    

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency> 

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>                                        

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

         

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

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

             <artifactId>tuscany-monitor-logging</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>            

         </dependency>        

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>   

         

diff --git a/java/sca/itest/exceptions-cross-binding-ws/pom.xml b/java/sca/itest/exceptions-cross-binding-ws/pom.xml
index e7ecb604dc..69be53cfe7 100644
--- a/java/sca/itest/exceptions-cross-binding-ws/pom.xml
+++ b/java/sca/itest/exceptions-cross-binding-ws/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/itest/exceptions-cross-binding/pom.xml b/java/sca/itest/exceptions-cross-binding/pom.xml
index 3d4a4a3880..140b1f352d 100644
--- a/java/sca/itest/exceptions-cross-binding/pom.xml
+++ b/java/sca/itest/exceptions-cross-binding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/itest/exceptions-simple-ws/pom.xml b/java/sca/itest/exceptions-simple-ws/pom.xml
index bd6646344d..3450e3a79d 100644
--- a/java/sca/itest/exceptions-simple-ws/pom.xml
+++ b/java/sca/itest/exceptions-simple-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/exceptions/pom.xml b/java/sca/itest/exceptions/pom.xml
index 43b0956e05..a726d5a5c9 100644
--- a/java/sca/itest/exceptions/pom.xml
+++ b/java/sca/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/extended-api/pom.xml b/java/sca/itest/extended-api/pom.xml
index 26545ef2d3..fc857f21e1 100644
--- a/java/sca/itest/extended-api/pom.xml
+++ b/java/sca/itest/extended-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -41,7 +41,7 @@
             
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             
             <scope>runtime</scope>
         
diff --git a/java/sca/itest/interfaces/pom.xml b/java/sca/itest/interfaces/pom.xml
index 65de919e10..d20e389c6d 100644
--- a/java/sca/itest/interfaces/pom.xml
+++ b/java/sca/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/interop-soap-client/pom.xml b/java/sca/itest/interop-soap-client/pom.xml
index 2369b8489e..2fdc43ea32 100644
--- a/java/sca/itest/interop-soap-client/pom.xml
+++ b/java/sca/itest/interop-soap-client/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-interop-soap-client</artifactId>
@@ -33,47 +33,47 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -107,7 +107,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/interop-soap-round2-client/pom.xml b/java/sca/itest/interop-soap-round2-client/pom.xml
index 9ac6661a5e..2757b21632 100644
--- a/java/sca/itest/interop-soap-round2-client/pom.xml
+++ b/java/sca/itest/interop-soap-round2-client/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-interop-soap-round2-client</artifactId>
@@ -32,47 +32,47 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -106,7 +106,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/interop-soap-service/pom.xml b/java/sca/itest/interop-soap-service/pom.xml
index 76285e3926..e414b934a2 100644
--- a/java/sca/itest/interop-soap-service/pom.xml
+++ b/java/sca/itest/interop-soap-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,27 +34,27 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -115,7 +115,7 @@
             <plugin>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-maven-wsdl2java</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/itest/jms-args/pom.xml b/java/sca/itest/jms-args/pom.xml
index eae5792e70..dbddf929af 100644
--- a/java/sca/itest/jms-args/pom.xml
+++ b/java/sca/itest/jms-args/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/itest/jms-callbacks/pom.xml b/java/sca/itest/jms-callbacks/pom.xml
index a495a8309a..ceb8d128b2 100644
--- a/java/sca/itest/jms-callbacks/pom.xml
+++ b/java/sca/itest/jms-callbacks/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/itest/jms-definitions/pom.xml b/java/sca/itest/jms-definitions/pom.xml
index 78a7c64e8f..5f594ea957 100644
--- a/java/sca/itest/jms-definitions/pom.xml
+++ b/java/sca/itest/jms-definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/itest/jms-format/pom.xml b/java/sca/itest/jms-format/pom.xml
index 03a7144e3e..d9168ee4e6 100644
--- a/java/sca/itest/jms-format/pom.xml
+++ b/java/sca/itest/jms-format/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms-format</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/itest/jms-selectors/pom.xml b/java/sca/itest/jms-selectors/pom.xml
index fe28f449d1..5c0a61bf3e 100644
--- a/java/sca/itest/jms-selectors/pom.xml
+++ b/java/sca/itest/jms-selectors/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

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

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/itest/jms/pom.xml b/java/sca/itest/jms/pom.xml
index 1bed1c9f3c..49081dc48f 100644
--- a/java/sca/itest/jms/pom.xml
+++ b/java/sca/itest/jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/itest/large-sdo-ws/pom.xml b/java/sca/itest/large-sdo-ws/pom.xml
index cd67a16b3a..a65a90edd0 100644
--- a/java/sca/itest/large-sdo-ws/pom.xml
+++ b/java/sca/itest/large-sdo-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-large-sdo-ws</artifactId>
@@ -33,27 +33,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -84,7 +84,7 @@
                 <dependency>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-host-tomcat</artifactId>
-                    <version>1.4-SNAPSHOT</version>
+                    <version>2.0-SNAPSHOT</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/java/sca/itest/late-reference-resolution/pom.xml b/java/sca/itest/late-reference-resolution/pom.xml
index 4b798109e1..3b7325e35d 100644
--- a/java/sca/itest/late-reference-resolution/pom.xml
+++ b/java/sca/itest/late-reference-resolution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                                        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/java/sca/itest/oneway/pom.xml b/java/sca/itest/oneway/pom.xml
index ba61e1e0c0..f28cf2a577 100644
--- a/java/sca/itest/oneway/pom.xml
+++ b/java/sca/itest/oneway/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>        

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

                 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

     </dependencies>

diff --git a/java/sca/itest/operation-overloading/pom.xml b/java/sca/itest/operation-overloading/pom.xml
index 2f28908e6b..9cfa1e6318 100644
--- a/java/sca/itest/operation-overloading/pom.xml
+++ b/java/sca/itest/operation-overloading/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml
index f2ec045a5c..a26e309cbc 100644
--- a/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/java/sca/itest/osgi-contribution/contribution-classes/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes/pom.xml
index f70760a5fe..b8524b90a7 100644
--- a/java/sca/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/java/sca/itest/osgi-contribution/contribution-classes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/java/sca/itest/osgi-contribution/contribution-test/pom.xml b/java/sca/itest/osgi-contribution/contribution-test/pom.xml
index 505452c4df..5ee3746bbb 100644
--- a/java/sca/itest/osgi-contribution/contribution-test/pom.xml
+++ b/java/sca/itest/osgi-contribution/contribution-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/itest/osgi-contribution/pom.xml b/java/sca/itest/osgi-contribution/pom.xml
index 22a677925e..85656d9702 100644
--- a/java/sca/itest/osgi-contribution/pom.xml
+++ b/java/sca/itest/osgi-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/java/sca/itest/osgi-implementation/pom.xml b/java/sca/itest/osgi-implementation/pom.xml
index 3ccab0fd8a..4fbc4258d0 100644
--- a/java/sca/itest/osgi-implementation/pom.xml
+++ b/java/sca/itest/osgi-implementation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-implementation</artifactId>
@@ -58,54 +58,54 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index d879d9c200..189012d38b 100644
--- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-osgi-tuscany-test</artifactId>

diff --git a/java/sca/itest/osgi-tuscany/pom.xml b/java/sca/itest/osgi-tuscany/pom.xml
index 0da4f09d61..ad589503d6 100644
--- a/java/sca/itest/osgi-tuscany/pom.xml
+++ b/java/sca/itest/osgi-tuscany/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-osgi-tuscany</artifactId>

diff --git a/java/sca/itest/osgi-tuscany/test-bundles/pom.xml b/java/sca/itest/osgi-tuscany/test-bundles/pom.xml
index b53beea930..4cbe7b4f85 100644
--- a/java/sca/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/java/sca/itest/osgi-tuscany/test-bundles/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 5b8c5ee0f5..1b763f205a 100644
--- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-osgi-tuscany-installer</artifactId>
diff --git a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
index a218e34c3f..f08acaa994 100644
--- a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>
diff --git a/java/sca/itest/policy-security-basicauth/pom.xml b/java/sca/itest/policy-security-basicauth/pom.xml
index 03002e6cf2..183f049a9a 100644
--- a/java/sca/itest/policy-security-basicauth/pom.xml
+++ b/java/sca/itest/policy-security-basicauth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
diff --git a/java/sca/itest/policy-security-jsr250/pom.xml b/java/sca/itest/policy-security-jsr250/pom.xml
index 2e1ed65eae..245eeb7673 100644
--- a/java/sca/itest/policy-security-jsr250/pom.xml
+++ b/java/sca/itest/policy-security-jsr250/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/java/sca/itest/policy-security-token/pom.xml b/java/sca/itest/policy-security-token/pom.xml
index 761aae3bc7..af7c2fe882 100644
--- a/java/sca/itest/policy-security-token/pom.xml
+++ b/java/sca/itest/policy-security-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-security-token</artifactId>
@@ -32,41 +32,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
diff --git a/java/sca/itest/policy-security/pom.xml b/java/sca/itest/policy-security/pom.xml
index 3011c2ff99..8a7965f20e 100644
--- a/java/sca/itest/policy-security/pom.xml
+++ b/java/sca/itest/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/java/sca/itest/policy/pom.xml b/java/sca/itest/policy/pom.xml
index 8f7b692cff..16fd2039c0 100644
--- a/java/sca/itest/policy/pom.xml
+++ b/java/sca/itest/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
 
diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml
index 90a0ae3780..0da7f71748 100644
--- a/java/sca/itest/pom.xml
+++ b/java/sca/itest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
@@ -147,13 +147,13 @@
                 <dependency>
 	    	    <groupId>org.apache.tuscany.sca</groupId>
 	    	    <artifactId>tuscany-host-webapp</artifactId>
-	    	    <version>1.4-SNAPSHOT</version>
+	    	    <version>2.0-SNAPSHOT</version>
                     <scope>runtime</scope>
 	    	</dependency>
                 <dependency>
 	    	    <groupId>org.apache.tuscany.sca</groupId>
 	    	    <artifactId>tuscany-host-webapp-junit</artifactId>
-	    	    <version>1.4-SNAPSHOT</version>
+	    	    <version>2.0-SNAPSHOT</version>
                     <scope>runtime</scope>
 	    	</dependency>
                 <dependency>
@@ -241,7 +241,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -332,7 +332,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -426,7 +426,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -519,7 +519,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
@@ -616,7 +616,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>generate-web-xml</id>
diff --git a/java/sca/itest/promotion-interface-missmatch/pom.xml b/java/sca/itest/promotion-interface-missmatch/pom.xml
index 0b3c3cf0c7..1e729bbc88 100644
--- a/java/sca/itest/promotion-interface-missmatch/pom.xml
+++ b/java/sca/itest/promotion-interface-missmatch/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/properties/pom.xml b/java/sca/itest/properties/pom.xml
index 62a50f1f54..8ab9eccb6d 100644
--- a/java/sca/itest/properties/pom.xml
+++ b/java/sca/itest/properties/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/itest/recursive-multi-level/pom.xml b/java/sca/itest/recursive-multi-level/pom.xml
index 48d45e50f6..aeb3e4a570 100644
--- a/java/sca/itest/recursive-multi-level/pom.xml
+++ b/java/sca/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>       
     </dependencies>
diff --git a/java/sca/itest/recursive-ws/pom.xml b/java/sca/itest/recursive-ws/pom.xml
index 5ed11a4c7a..4ff655e6b1 100644
--- a/java/sca/itest/recursive-ws/pom.xml
+++ b/java/sca/itest/recursive-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -77,7 +77,7 @@
                 <dependency>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-host-jetty</artifactId>
-                    <version>1.4-SNAPSHOT</version>
+                    <version>2.0-SNAPSHOT</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/java/sca/itest/recursive/pom.xml b/java/sca/itest/recursive/pom.xml
index 20aa39e90d..5bfd74f49d 100644
--- a/java/sca/itest/recursive/pom.xml
+++ b/java/sca/itest/recursive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/references/pom.xml b/java/sca/itest/references/pom.xml
index 5558936b92..937668407b 100644
--- a/java/sca/itest/references/pom.xml
+++ b/java/sca/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/java/sca/itest/scopes/pom.xml b/java/sca/itest/scopes/pom.xml
index cf7010ca91..994a1a4bb6 100644
--- a/java/sca/itest/scopes/pom.xml
+++ b/java/sca/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Apache Tuscany SCA Scopes Integration Tests</name>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/serialization/pom.xml b/java/sca/itest/serialization/pom.xml
index 9a6c3ea1e3..7350c243f4 100644
--- a/java/sca/itest/serialization/pom.xml
+++ b/java/sca/itest/serialization/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>       
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
            
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/services/pom.xml b/java/sca/itest/services/pom.xml
index fdd5213a47..b0c459af1c 100644
--- a/java/sca/itest/services/pom.xml
+++ b/java/sca/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/spring/pom.xml b/java/sca/itest/spring/pom.xml
index a062617ee1..ce5e060d46 100644
--- a/java/sca/itest/spring/pom.xml
+++ b/java/sca/itest/spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-spring</artifactId>
@@ -32,60 +32,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/itest/transaction/pom.xml b/java/sca/itest/transaction/pom.xml
index 3b8f3700f1..efdd2bf5a4 100644
--- a/java/sca/itest/transaction/pom.xml
+++ b/java/sca/itest/transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/validation/pom.xml b/java/sca/itest/validation/pom.xml
index a5ee99675d..b8abe4d380 100644
--- a/java/sca/itest/validation/pom.xml
+++ b/java/sca/itest/validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -112,20 +112,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                
         <dependency>
@@ -163,4 +163,4 @@
     <build>
        <finalName>${artifactId}</finalName>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/itest/wires/pom.xml b/java/sca/itest/wires/pom.xml
index 08a97d8414..4e14bcaeb6 100644
--- a/java/sca/itest/wires/pom.xml
+++ b/java/sca/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/itest/ws-void-args-return/pom.xml b/java/sca/itest/ws-void-args-return/pom.xml
index 673a887758..b3f3fe5982 100644
--- a/java/sca/itest/ws-void-args-return/pom.xml
+++ b/java/sca/itest/ws-void-args-return/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/itest/wsdl-multiple/pom.xml b/java/sca/itest/wsdl-multiple/pom.xml
index 4d65aaf25c..b8f499a754 100644
--- a/java/sca/itest/wsdl-multiple/pom.xml
+++ b/java/sca/itest/wsdl-multiple/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/wsdl/pom.xml b/java/sca/itest/wsdl/pom.xml
index 9c48a604b5..871653ca18 100644
--- a/java/sca/itest/wsdl/pom.xml
+++ b/java/sca/itest/wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/itest/wsdl2java/pom.xml b/java/sca/itest/wsdl2java/pom.xml
index 4691ce1ace..ff8ae3f8e2 100644
--- a/java/sca/itest/wsdl2java/pom.xml
+++ b/java/sca/itest/wsdl2java/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-wsdl2java</artifactId>
@@ -31,42 +31,42 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -159,7 +159,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/itest/wsdlless/pom.xml b/java/sca/itest/wsdlless/pom.xml
index 08c84589ea..7630651bc6 100644
--- a/java/sca/itest/wsdlless/pom.xml
+++ b/java/sca/itest/wsdlless/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -199,4 +199,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/modules/api/pom.xml b/java/sca/modules/api/pom.xml
index fa996acf11..92f6bf9189 100644
--- a/java/sca/modules/api/pom.xml
+++ b/java/sca/modules/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <exclusions>

                 <exclusion>

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

diff --git a/java/sca/modules/assembly-java-dsl/pom.xml b/java/sca/modules/assembly-java-dsl/pom.xml
index 24c6db84b2..8da66dbfef 100644
--- a/java/sca/modules/assembly-java-dsl/pom.xml
+++ b/java/sca/modules/assembly-java-dsl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-java-dsl</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
  
diff --git a/java/sca/modules/assembly-xml/pom.xml b/java/sca/modules/assembly-xml/pom.xml
index 246f89619b..e8bb73d2b5 100644
--- a/java/sca/modules/assembly-xml/pom.xml
+++ b/java/sca/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
@@ -87,35 +87,35 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/assembly-xsd/pom.xml b/java/sca/modules/assembly-xsd/pom.xml
index 90bb93222d..d1e7bf5113 100644
--- a/java/sca/modules/assembly-xsd/pom.xml
+++ b/java/sca/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/java/sca/modules/assembly/pom.xml b/java/sca/modules/assembly/pom.xml
index 5257d7ef63..80e7f2c35b 100644
--- a/java/sca/modules/assembly/pom.xml
+++ b/java/sca/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/java/sca/modules/binding-atom-abdera/pom.xml b/java/sca/modules/binding-atom-abdera/pom.xml
index ffd594ee30..8a236359b6 100644
--- a/java/sca/modules/binding-atom-abdera/pom.xml
+++ b/java/sca/modules/binding-atom-abdera/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,49 +33,49 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -150,21 +150,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-atom/pom.xml b/java/sca/modules/binding-atom/pom.xml
index 961d564af6..fc240bdb6a 100644
--- a/java/sca/modules/binding-atom/pom.xml
+++ b/java/sca/modules/binding-atom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
 			<scope>test</scope>			
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
         </dependency>
 		
diff --git a/java/sca/modules/binding-corba-runtime/pom.xml b/java/sca/modules/binding-corba-runtime/pom.xml
index 69321c9345..fbe0d89890 100644
--- a/java/sca/modules/binding-corba-runtime/pom.xml
+++ b/java/sca/modules/binding-corba-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
     
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 	
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/java/sca/modules/binding-corba/pom.xml b/java/sca/modules/binding-corba/pom.xml
index 2eda625e4a..4358fd5d2e 100644
--- a/java/sca/modules/binding-corba/pom.xml
+++ b/java/sca/modules/binding-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-host-corba</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</dependency>
 	
     </dependencies>
diff --git a/java/sca/modules/binding-dwr/pom.xml b/java/sca/modules/binding-dwr/pom.xml
index 1595daa5bf..19f98a4c23 100644
--- a/java/sca/modules/binding-dwr/pom.xml
+++ b/java/sca/modules/binding-dwr/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/java/sca/modules/binding-ejb-runtime/pom.xml b/java/sca/modules/binding-ejb-runtime/pom.xml
index c89585c95c..8c01c4d079 100644
--- a/java/sca/modules/binding-ejb-runtime/pom.xml
+++ b/java/sca/modules/binding-ejb-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -67,14 +67,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-ejb/pom.xml b/java/sca/modules/binding-ejb/pom.xml
index be8ca05164..a697572a39 100644
--- a/java/sca/modules/binding-ejb/pom.xml
+++ b/java/sca/modules/binding-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-feed/pom.xml b/java/sca/modules/binding-feed/pom.xml
index 046bee6acb..c0c895a894 100644
--- a/java/sca/modules/binding-feed/pom.xml
+++ b/java/sca/modules/binding-feed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -88,21 +88,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-gdata-runtime/pom.xml b/java/sca/modules/binding-gdata-runtime/pom.xml
index faef032c25..9bf0bdec09 100644
--- a/java/sca/modules/binding-gdata-runtime/pom.xml
+++ b/java/sca/modules/binding-gdata-runtime/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-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.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-core-spi</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-http</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -125,21 +125,21 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/java/sca/modules/binding-gdata/pom.xml b/java/sca/modules/binding-gdata/pom.xml
index 21895f4af6..5b68d4936c 100644
--- a/java/sca/modules/binding-gdata/pom.xml
+++ b/java/sca/modules/binding-gdata/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-gdata2-runtime/pom.xml b/java/sca/modules/binding-gdata2-runtime/pom.xml
index 351cbe8439..0768864c1c 100644
--- a/java/sca/modules/binding-gdata2-runtime/pom.xml
+++ b/java/sca/modules/binding-gdata2-runtime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,43 +39,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-gdata2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -94,21 +94,21 @@
         <dependency>
         	<groupId>org.apache.tuscany.sca</groupId>
       		<artifactId>tuscany-host-jetty</artifactId>
-      		<version>1.4-SNAPSHOT</version>
+      		<version>2.0-SNAPSHOT</version>
       		<scope>test</scope>
 	    </dependency>           
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version> 
+            <version>2.0-SNAPSHOT</version> 
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
diff --git a/java/sca/modules/binding-gdata2/pom.xml b/java/sca/modules/binding-gdata2/pom.xml
index 0bf31877fc..b0747685d3 100644
--- a/java/sca/modules/binding-gdata2/pom.xml
+++ b/java/sca/modules/binding-gdata2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		
         <dependency>
diff --git a/java/sca/modules/binding-http-runtime/pom.xml b/java/sca/modules/binding-http-runtime/pom.xml
index 1ceeaae1d8..4d27bfc66d 100644
--- a/java/sca/modules/binding-http-runtime/pom.xml
+++ b/java/sca/modules/binding-http-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -64,28 +64,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-http/pom.xml b/java/sca/modules/binding-http/pom.xml
index 676492413f..79e49e9c5d 100644
--- a/java/sca/modules/binding-http/pom.xml
+++ b/java/sca/modules/binding-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-jms-policy/pom.xml b/java/sca/modules/binding-jms-policy/pom.xml
index 56d79557b7..e03e03bf23 100644
--- a/java/sca/modules/binding-jms-policy/pom.xml
+++ b/java/sca/modules/binding-jms-policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -57,19 +57,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-reliability</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>       
     </dependencies>
 		
diff --git a/java/sca/modules/binding-jms-runtime/pom.xml b/java/sca/modules/binding-jms-runtime/pom.xml
index e8527eda7f..c313ec7183 100644
--- a/java/sca/modules/binding-jms-runtime/pom.xml
+++ b/java/sca/modules/binding-jms-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -100,14 +100,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-jms/pom.xml b/java/sca/modules/binding-jms/pom.xml
index e7dd413a78..0c5705d785 100644
--- a/java/sca/modules/binding-jms/pom.xml
+++ b/java/sca/modules/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-jsonrpc-runtime/pom.xml b/java/sca/modules/binding-jsonrpc-runtime/pom.xml
index 8ec5e52a0f..d0dc979286 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/pom.xml
+++ b/java/sca/modules/binding-jsonrpc-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
@@ -107,14 +107,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
diff --git a/java/sca/modules/binding-jsonrpc/pom.xml b/java/sca/modules/binding-jsonrpc/pom.xml
index 50b68f06ca..fd7c1e594b 100644
--- a/java/sca/modules/binding-jsonrpc/pom.xml
+++ b/java/sca/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/binding-notification/pom.xml b/java/sca/modules/binding-notification/pom.xml
index 98cc576864..3ca7fae9ab 100644
--- a/java/sca/modules/binding-notification/pom.xml
+++ b/java/sca/modules/binding-notification/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         <dependency>

diff --git a/java/sca/modules/binding-rmi-runtime/pom.xml b/java/sca/modules/binding-rmi-runtime/pom.xml
index 869eb475b0..c75df5b34a 100644
--- a/java/sca/modules/binding-rmi-runtime/pom.xml
+++ b/java/sca/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-rmi/pom.xml b/java/sca/modules/binding-rmi/pom.xml
index 5f96169522..d023f7910c 100644
--- a/java/sca/modules/binding-rmi/pom.xml
+++ b/java/sca/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-rss-rome/pom.xml b/java/sca/modules/binding-rss-rome/pom.xml
index 19796b37f1..5a51b49979 100644
--- a/java/sca/modules/binding-rss-rome/pom.xml
+++ b/java/sca/modules/binding-rss-rome/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,43 +33,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -94,21 +94,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-rss/pom.xml b/java/sca/modules/binding-rss/pom.xml
index cd51de1088..557a927e60 100644
--- a/java/sca/modules/binding-rss/pom.xml
+++ b/java/sca/modules/binding-rss/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,38 +33,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/binding-sca-axis2/pom.xml b/java/sca/modules/binding-sca-axis2/pom.xml
index 3ca3e1f76b..1836315992 100644
--- a/java/sca/modules/binding-sca-axis2/pom.xml
+++ b/java/sca/modules/binding-sca-axis2/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>      

         

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>            

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-endpoint</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

 

diff --git a/java/sca/modules/binding-sca-corba/pom.xml b/java/sca/modules/binding-sca-corba/pom.xml
index 52b41e9e45..2107e2f322 100644
--- a/java/sca/modules/binding-sca-corba/pom.xml
+++ b/java/sca/modules/binding-sca-corba/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-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.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/java/sca/modules/binding-sca-jms/pom.xml b/java/sca/modules/binding-sca-jms/pom.xml
index 680928ad55..b870e5e384 100644
--- a/java/sca/modules/binding-sca-jms/pom.xml
+++ b/java/sca/modules/binding-sca-jms/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>      

         

         <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>            

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-endpoint</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>         

 

diff --git a/java/sca/modules/binding-sca-xml/pom.xml b/java/sca/modules/binding-sca-xml/pom.xml
index e27926d1ab..a4fd56d1c7 100644
--- a/java/sca/modules/binding-sca-xml/pom.xml
+++ b/java/sca/modules/binding-sca-xml/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>   
               
         <dependency>
diff --git a/java/sca/modules/binding-sca/pom.xml b/java/sca/modules/binding-sca/pom.xml
index c8af2d4628..ddad1ec83a 100644
--- a/java/sca/modules/binding-sca/pom.xml
+++ b/java/sca/modules/binding-sca/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,31 +35,31 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
diff --git a/java/sca/modules/binding-ws-axis2-policy/pom.xml b/java/sca/modules/binding-ws-axis2-policy/pom.xml
index 643a00030c..35b62801fc 100644
--- a/java/sca/modules/binding-ws-axis2-policy/pom.xml
+++ b/java/sca/modules/binding-ws-axis2-policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 		
     	<dependency>
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index 74d217e98b..9078c68c39 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,63 +42,63 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -271,21 +271,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/binding-ws-wsdlgen/pom.xml b/java/sca/modules/binding-ws-wsdlgen/pom.xml
index 3afa296bc1..baea91ae3e 100644
--- a/java/sca/modules/binding-ws-wsdlgen/pom.xml
+++ b/java/sca/modules/binding-ws-wsdlgen/pom.xml
@@ -1,108 +1,108 @@
-<?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.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-    <name>Apache Tuscany SCA Web Service binding WSDL Generator</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>test</scope>
-        </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.binding.ws.wsdlgen</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws.wsdlgen*</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>2.0-SNAPSHOT</version>

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

+    </parent>

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

+    <name>Apache Tuscany SCA Web Service binding WSDL Generator</name>

+

+    <dependencies>

+

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-wsdl</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-wsdl-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-java</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-interface-java-jaxws</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>        

+        <dependency>

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

+            <artifactId>tuscany-xsd</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-xsd-xml</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

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

+            <artifactId>tuscany-databinding</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <scope>test</scope>

+        </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.binding.ws.wsdlgen</Bundle-SymbolicName>

+                        <Bundle-Description>${pom.name}</Bundle-Description>

+                        <Export-Package>org.apache.tuscany.sca.binding.ws.wsdlgen*</Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/modules/binding-ws-xml/pom.xml b/java/sca/modules/binding-ws-xml/pom.xml
index 6a3151cd04..6e5b800105 100644
--- a/java/sca/modules/binding-ws-xml/pom.xml
+++ b/java/sca/modules/binding-ws-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>                
     </dependencies>
 
diff --git a/java/sca/modules/binding-ws/pom.xml b/java/sca/modules/binding-ws/pom.xml
index 8a6ade06eb..2792f5a850 100644
--- a/java/sca/modules/binding-ws/pom.xml
+++ b/java/sca/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/java/sca/modules/contribution-groovy/pom.xml b/java/sca/modules/contribution-groovy/pom.xml
index 9a9f709346..8d90752993 100644
--- a/java/sca/modules/contribution-groovy/pom.xml
+++ b/java/sca/modules/contribution-groovy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/contribution-impl/pom.xml b/java/sca/modules/contribution-impl/pom.xml
index c971f1390d..ee25cafc12 100644
--- a/java/sca/modules/contribution-impl/pom.xml
+++ b/java/sca/modules/contribution-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/modules/contribution-java/pom.xml b/java/sca/modules/contribution-java/pom.xml
index 8e57661a84..5a63f16ee0 100644
--- a/java/sca/modules/contribution-java/pom.xml
+++ b/java/sca/modules/contribution-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution-jee/pom.xml b/java/sca/modules/contribution-jee/pom.xml
index f89e41edcf..dec945d60c 100644
--- a/java/sca/modules/contribution-jee/pom.xml
+++ b/java/sca/modules/contribution-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-jee</artifactId>
@@ -32,49 +32,49 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <!--scope>runtime</scope-->
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <!--scope>runtime</scope-->
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jee</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/modules/contribution-namespace/pom.xml b/java/sca/modules/contribution-namespace/pom.xml
index c2c4c51bfb..33ed92b32d 100644
--- a/java/sca/modules/contribution-namespace/pom.xml
+++ b/java/sca/modules/contribution-namespace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml
index 284d70ca21..798eb562d1 100644
--- a/java/sca/modules/contribution-osgi/pom.xml
+++ b/java/sca/modules/contribution-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution-resource/pom.xml b/java/sca/modules/contribution-resource/pom.xml
index 5a2422ed4c..34b5bb5902 100644
--- a/java/sca/modules/contribution-resource/pom.xml
+++ b/java/sca/modules/contribution-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution-updater-impl/pom.xml b/java/sca/modules/contribution-updater-impl/pom.xml
index cd4f1e17ee..22d3f3d14f 100644
--- a/java/sca/modules/contribution-updater-impl/pom.xml
+++ b/java/sca/modules/contribution-updater-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-updater-impl</artifactId>
@@ -32,61 +32,61 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
     	   <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
 	</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
 	    <groupId>org.apache.tuscany.sca</groupId>
 	    <artifactId>tuscany-assembly-xml</artifactId>
-	    <version>1.4-SNAPSHOT</version>	
+	    <version>2.0-SNAPSHOT</version>	
 	</dependency>
 	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-updater</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 	
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 	
         <dependency>
diff --git a/java/sca/modules/contribution-updater/pom.xml b/java/sca/modules/contribution-updater/pom.xml
index 26dc2152a2..3eb320b54f 100644
--- a/java/sca/modules/contribution-updater/pom.xml
+++ b/java/sca/modules/contribution-updater/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-updater</artifactId>
@@ -32,61 +32,61 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
     	   <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
 	</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
 	    <groupId>org.apache.tuscany.sca</groupId>
 	    <artifactId>tuscany-assembly-xml</artifactId>
-	    <version>1.4-SNAPSHOT</version>	
+	    <version>2.0-SNAPSHOT</version>	
 	</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
                                
         <dependency>
          <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-node-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         </dependency>  
     </dependencies>
 
diff --git a/java/sca/modules/contribution-xml/pom.xml b/java/sca/modules/contribution-xml/pom.xml
index 4fb3e06a57..5db4b32cf3 100644
--- a/java/sca/modules/contribution-xml/pom.xml
+++ b/java/sca/modules/contribution-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution/pom.xml b/java/sca/modules/contribution/pom.xml
index 5a1c4b55b5..f491b0562b 100644
--- a/java/sca/modules/contribution/pom.xml
+++ b/java/sca/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
             	
         <dependency>
diff --git a/java/sca/modules/core-databinding/pom.xml b/java/sca/modules/core-databinding/pom.xml
index b665593aca..faa6bfca9a 100644
--- a/java/sca/modules/core-databinding/pom.xml
+++ b/java/sca/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/java/sca/modules/core-spi/pom.xml b/java/sca/modules/core-spi/pom.xml
index e8cb583819..2880b1a600 100644
--- a/java/sca/modules/core-spi/pom.xml
+++ b/java/sca/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,44 +32,44 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>                        
 
         <dependency>
diff --git a/java/sca/modules/core-spring/pom.xml b/java/sca/modules/core-spring/pom.xml
index b321d194b5..15156bd980 100644
--- a/java/sca/modules/core-spring/pom.xml
+++ b/java/sca/modules/core-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spring</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -69,37 +69,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
    
     </dependencies>
diff --git a/java/sca/modules/core/pom.xml b/java/sca/modules/core/pom.xml
index 17da5a4d2b..a7bf9d55d5 100644
--- a/java/sca/modules/core/pom.xml
+++ b/java/sca/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/modules/data-api/pom.xml b/java/sca/modules/data-api/pom.xml
index 04b259a69a..542e757053 100644
--- a/java/sca/modules/data-api/pom.xml
+++ b/java/sca/modules/data-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 	</dependencies>

 

diff --git a/java/sca/modules/data-engine-helper/pom.xml b/java/sca/modules/data-engine-helper/pom.xml
index c8a4689650..ba01e8fa24 100644
--- a/java/sca/modules/data-engine-helper/pom.xml
+++ b/java/sca/modules/data-engine-helper/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-data-engine-helper</artifactId>
@@ -46,55 +46,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding-axiom/pom.xml b/java/sca/modules/databinding-axiom/pom.xml
index 6e0d634419..9ba2add6d1 100644
--- a/java/sca/modules/databinding-axiom/pom.xml
+++ b/java/sca/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding-fastinfoset/pom.xml b/java/sca/modules/databinding-fastinfoset/pom.xml
index 3c060bf213..4d83d1875d 100644
--- a/java/sca/modules/databinding-fastinfoset/pom.xml
+++ b/java/sca/modules/databinding-fastinfoset/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding-jaxb-axiom/pom.xml b/java/sca/modules/databinding-jaxb-axiom/pom.xml
index c4dd61571a..7fb2b65669 100644
--- a/java/sca/modules/databinding-jaxb-axiom/pom.xml
+++ b/java/sca/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/java/sca/modules/databinding-jaxb/pom.xml b/java/sca/modules/databinding-jaxb/pom.xml
index 8b819e06d3..acf6e75d80 100644
--- a/java/sca/modules/databinding-jaxb/pom.xml
+++ b/java/sca/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <!-- 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
          -->
         <dependency>
diff --git a/java/sca/modules/databinding-job/pom.xml b/java/sca/modules/databinding-job/pom.xml
index d3dc6bdf50..fbbf3cc5f0 100644
--- a/java/sca/modules/databinding-job/pom.xml
+++ b/java/sca/modules/databinding-job/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-job</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 	
         <dependency>
diff --git a/java/sca/modules/databinding-json/pom.xml b/java/sca/modules/databinding-json/pom.xml
index 7609df06aa..41c3b6abbb 100644
--- a/java/sca/modules/databinding-json/pom.xml
+++ b/java/sca/modules/databinding-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding-saxon/pom.xml b/java/sca/modules/databinding-saxon/pom.xml
index 390bf1f4f5..ae46e33022 100644
--- a/java/sca/modules/databinding-saxon/pom.xml
+++ b/java/sca/modules/databinding-saxon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <!--dependency>
diff --git a/java/sca/modules/databinding-sdo-axiom/pom.xml b/java/sca/modules/databinding-sdo-axiom/pom.xml
index e64e99fa9f..b84197931e 100644
--- a/java/sca/modules/databinding-sdo-axiom/pom.xml
+++ b/java/sca/modules/databinding-sdo-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
        <dependency>
diff --git a/java/sca/modules/databinding-sdo/pom.xml b/java/sca/modules/databinding-sdo/pom.xml
index 14e353699c..24d49982a1 100644
--- a/java/sca/modules/databinding-sdo/pom.xml
+++ b/java/sca/modules/databinding-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
diff --git a/java/sca/modules/databinding-xmlbeans/pom.xml b/java/sca/modules/databinding-xmlbeans/pom.xml
index 29f215641a..f9f02ae6ab 100644
--- a/java/sca/modules/databinding-xmlbeans/pom.xml
+++ b/java/sca/modules/databinding-xmlbeans/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding-xstream/pom.xml b/java/sca/modules/databinding-xstream/pom.xml
index 2bd126b2eb..e40f9d52a8 100644
--- a/java/sca/modules/databinding-xstream/pom.xml
+++ b/java/sca/modules/databinding-xstream/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/databinding/pom.xml b/java/sca/modules/databinding/pom.xml
index 8021c62970..5307b490a1 100644
--- a/java/sca/modules/databinding/pom.xml
+++ b/java/sca/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>		
 
         <dependency>
diff --git a/java/sca/modules/definitions-xml/pom.xml b/java/sca/modules/definitions-xml/pom.xml
index 75db3b51b0..64fbe6578f 100644
--- a/java/sca/modules/definitions-xml/pom.xml
+++ b/java/sca/modules/definitions-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-definitions</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     	

         <dependency>

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

             <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/modules/definitions/pom.xml b/java/sca/modules/definitions/pom.xml
index 8e6d0cfebb..791dad5189 100644
--- a/java/sca/modules/definitions/pom.xml
+++ b/java/sca/modules/definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     

     	<dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/modules/domain-manager/pom.xml b/java/sca/modules/domain-manager/pom.xml
index 5a526b158a..aaf915d453 100644
--- a/java/sca/modules/domain-manager/pom.xml
+++ b/java/sca/modules/domain-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -112,76 +112,76 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/java/sca/modules/endpoint/pom.xml b/java/sca/modules/endpoint/pom.xml
index 31e8adc800..9452d53898 100644
--- a/java/sca/modules/endpoint/pom.xml
+++ b/java/sca/modules/endpoint/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,59 +35,59 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>           
                
diff --git a/java/sca/modules/extensibility-equinox/pom.xml b/java/sca/modules/extensibility-equinox/pom.xml
index 9547e92f34..7c7881057f 100644
--- a/java/sca/modules/extensibility-equinox/pom.xml
+++ b/java/sca/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/extensibility-osgi/pom.xml b/java/sca/modules/extensibility-osgi/pom.xml
index 7667ca918f..d9b7909709 100644
--- a/java/sca/modules/extensibility-osgi/pom.xml
+++ b/java/sca/modules/extensibility-osgi/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-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.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
diff --git a/java/sca/modules/extensibility/pom.xml b/java/sca/modules/extensibility/pom.xml
index 01cd2d0ca9..c85f92f61d 100644
--- a/java/sca/modules/extensibility/pom.xml
+++ b/java/sca/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/java/sca/modules/extension-helper/pom.xml b/java/sca/modules/extension-helper/pom.xml
index a54e9e43a3..0b7f5ac1b7 100644
--- a/java/sca/modules/extension-helper/pom.xml
+++ b/java/sca/modules/extension-helper/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,25 +35,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/host-corba-jee/pom.xml b/java/sca/modules/host-corba-jee/pom.xml
index f17870ca8c..93d28c96cb 100644
--- a/java/sca/modules/host-corba-jee/pom.xml
+++ b/java/sca/modules/host-corba-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/host-corba-jse-tns/pom.xml b/java/sca/modules/host-corba-jse-tns/pom.xml
index 4c6f6af352..3837919ef3 100644
--- a/java/sca/modules/host-corba-jse-tns/pom.xml
+++ b/java/sca/modules/host-corba-jse-tns/pom.xml
@@ -1,71 +1,71 @@
-<?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.4-SNAPSHOT</version>
-    </parent>
-    <artifactId>tuscany-host-corba-jse-tns</artifactId>
-    <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>test</scope>
-        </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.host.corba.jse.tns</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.corba.jse.tns*</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>2.0-SNAPSHOT</version>

+    </parent>

+    <artifactId>tuscany-host-corba-jse-tns</artifactId>

+    <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>

+

+    <dependencies>

+    

+        <dependency>

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

+            <artifactId>tuscany-host-corba</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-host-corba-jse</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-binding-corba-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>test</scope>

+        </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.host.corba.jse.tns</Bundle-SymbolicName>

+                        <Bundle-Description>${pom.name}</Bundle-Description>

+                        <Export-Package>org.apache.tuscany.sca.host.corba.jse.tns*</Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/modules/host-corba-jse/pom.xml b/java/sca/modules/host-corba-jse/pom.xml
index d0c4c53900..1e46c6775e 100644
--- a/java/sca/modules/host-corba-jse/pom.xml
+++ b/java/sca/modules/host-corba-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/java/sca/modules/host-corba/pom.xml b/java/sca/modules/host-corba/pom.xml
index 2427fb9a05..8e8425c5fa 100644
--- a/java/sca/modules/host-corba/pom.xml
+++ b/java/sca/modules/host-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/java/sca/modules/host-ejb/pom.xml b/java/sca/modules/host-ejb/pom.xml
index 8fc42d6ee4..0d78f4ebc9 100644
--- a/java/sca/modules/host-ejb/pom.xml
+++ b/java/sca/modules/host-ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/java/sca/modules/host-embedded/pom.xml b/java/sca/modules/host-embedded/pom.xml
index 92fd8cc016..86cc176e5a 100644
--- a/java/sca/modules/host-embedded/pom.xml
+++ b/java/sca/modules/host-embedded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-embedded</artifactId>
@@ -32,79 +32,79 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
      
diff --git a/java/sca/modules/host-http/pom.xml b/java/sca/modules/host-http/pom.xml
index 258770c20b..34342e74f1 100644
--- a/java/sca/modules/host-http/pom.xml
+++ b/java/sca/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/host-jetty/pom.xml b/java/sca/modules/host-jetty/pom.xml
index 1a4c19b69a..8e18d4c1ab 100644
--- a/java/sca/modules/host-jetty/pom.xml
+++ b/java/sca/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/modules/host-openejb/pom.xml b/java/sca/modules/host-openejb/pom.xml
index 396d847f15..e00423725f 100644
--- a/java/sca/modules/host-openejb/pom.xml
+++ b/java/sca/modules/host-openejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

diff --git a/java/sca/modules/host-osgi/pom.xml b/java/sca/modules/host-osgi/pom.xml
index f68a96c57c..9a9315b315 100644
--- a/java/sca/modules/host-osgi/pom.xml
+++ b/java/sca/modules/host-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/host-rmi/pom.xml b/java/sca/modules/host-rmi/pom.xml
index 8700f1de85..f4ca7af060 100644
--- a/java/sca/modules/host-rmi/pom.xml
+++ b/java/sca/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/java/sca/modules/host-tomcat/pom.xml b/java/sca/modules/host-tomcat/pom.xml
index 58032e137d..4af2a30339 100644
--- a/java/sca/modules/host-tomcat/pom.xml
+++ b/java/sca/modules/host-tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/host-webapp-junit/pom.xml b/java/sca/modules/host-webapp-junit/pom.xml
index fb5f29df22..e96ba7ec60 100644
--- a/java/sca/modules/host-webapp-junit/pom.xml
+++ b/java/sca/modules/host-webapp-junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/modules/host-webapp/pom.xml b/java/sca/modules/host-webapp/pom.xml
index 67d7791be3..f334ada7a8 100644
--- a/java/sca/modules/host-webapp/pom.xml
+++ b/java/sca/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/implementation-bpel-jbpm/pom.xml b/java/sca/modules/implementation-bpel-jbpm/pom.xml
index 465a631a68..713050a604 100644
--- a/java/sca/modules/implementation-bpel-jbpm/pom.xml
+++ b/java/sca/modules/implementation-bpel-jbpm/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-implementation-bpel-jbpm</artifactId>
@@ -31,67 +31,67 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-bpel</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-contribution-impl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sdo</groupId>
diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml
index bd829fc33f..b431bdffb7 100644
--- a/java/sca/modules/implementation-bpel-ode/pom.xml
+++ b/java/sca/modules/implementation-bpel-ode/pom.xml
@@ -22,7 +22,7 @@
 	<parent>

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

 		<artifactId>tuscany-modules</artifactId>

-		<version>1.4-SNAPSHOT</version>

+		<version>2.0-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.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-implementation-bpel</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-core</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding-sdo</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

diff --git a/java/sca/modules/implementation-bpel/pom.xml b/java/sca/modules/implementation-bpel/pom.xml
index ac1e8af858..f7c2efbb98 100644
--- a/java/sca/modules/implementation-bpel/pom.xml
+++ b/java/sca/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>

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

 		<artifactId>tuscany-modules</artifactId>

-		<version>1.4-SNAPSHOT</version>

+		<version>2.0-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.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-java</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 

 		<dependency>

diff --git a/java/sca/modules/implementation-das/pom.xml b/java/sca/modules/implementation-das/pom.xml
index b9e42fb6a9..8dca0d084c 100644
--- a/java/sca/modules/implementation-das/pom.xml
+++ b/java/sca/modules/implementation-das/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-implementation-das</artifactId>

@@ -45,52 +45,52 @@
 		<dependency>

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

 			<artifactId>tuscany-assembly</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-core</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-data-engine-helper</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 			<scope>compile</scope>

 		</dependency>

 		<dependency>

diff --git a/java/sca/modules/implementation-data-xml/pom.xml b/java/sca/modules/implementation-data-xml/pom.xml
index 44c92f164e..39d82be0c7 100644
--- a/java/sca/modules/implementation-data-xml/pom.xml
+++ b/java/sca/modules/implementation-data-xml/pom.xml
@@ -21,7 +21,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-implementation-data-xml</artifactId>

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

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

 			<artifactId>tuscany-assembly</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-core</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-interface</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-databinding</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-data-engine-helper</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 			<scope>compile</scope>

 		</dependency>

 		<dependency>

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

 			<artifactId>tuscany-binding-atom-abdera</artifactId>

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 			<scope>runtime</scope>

 		</dependency>

 		<dependency>

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

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

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

-			<version>1.4-SNAPSHOT</version>

+			<version>2.0-SNAPSHOT</version>

 			<scope>test</scope>

 		</dependency>

 		<dependency>

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

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

             <artifactId>tuscany-data-api</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 	</dependencies>

diff --git a/java/sca/modules/implementation-ejb/pom.xml b/java/sca/modules/implementation-ejb/pom.xml
index 31da4af3c2..5accce1759 100644
--- a/java/sca/modules/implementation-ejb/pom.xml
+++ b/java/sca/modules/implementation-ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope> 
         </dependency>
 
diff --git a/java/sca/modules/implementation-java-runtime/pom.xml b/java/sca/modules/implementation-java-runtime/pom.xml
index 96510ea576..1f1378d5f7 100644
--- a/java/sca/modules/implementation-java-runtime/pom.xml
+++ b/java/sca/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/java/sca/modules/implementation-java-xml/pom.xml b/java/sca/modules/implementation-java-xml/pom.xml
index d89d7fd406..87844ac208 100644
--- a/java/sca/modules/implementation-java-xml/pom.xml
+++ b/java/sca/modules/implementation-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-xml</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -80,13 +80,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/java/sca/modules/implementation-java/pom.xml b/java/sca/modules/implementation-java/pom.xml
index 19adeeaf46..9aa421a392 100644
--- a/java/sca/modules/implementation-java/pom.xml
+++ b/java/sca/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/implementation-jee/pom.xml b/java/sca/modules/implementation-jee/pom.xml
index 9ea51f936f..160bf00419 100644
--- a/java/sca/modules/implementation-jee/pom.xml
+++ b/java/sca/modules/implementation-jee/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,19 +37,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope> 
         </dependency>
 
diff --git a/java/sca/modules/implementation-node-runtime/pom.xml b/java/sca/modules/implementation-node-runtime/pom.xml
index 7d61a1b972..7a81bae3a1 100644
--- a/java/sca/modules/implementation-node-runtime/pom.xml
+++ b/java/sca/modules/implementation-node-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-node/pom.xml b/java/sca/modules/implementation-node/pom.xml
index 69488e1fc9..48c8d015cd 100644
--- a/java/sca/modules/implementation-node/pom.xml
+++ b/java/sca/modules/implementation-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-notification/pom.xml b/java/sca/modules/implementation-notification/pom.xml
index a2ebb4289c..f8c45fea80 100644
--- a/java/sca/modules/implementation-notification/pom.xml
+++ b/java/sca/modules/implementation-notification/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 		        

         <!-- test dependencies -->

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

              <scope>test</scope>

         </dependency>        

     </dependencies>

diff --git a/java/sca/modules/implementation-openjpa/pom.xml b/java/sca/modules/implementation-openjpa/pom.xml
index ff5acd4e2c..1e87046410 100644
--- a/java/sca/modules/implementation-openjpa/pom.xml
+++ b/java/sca/modules/implementation-openjpa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-jpa</artifactId>
@@ -39,52 +39,52 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-contribution-impl</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-embedded</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-policy-transaction</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/java/sca/modules/implementation-osgi/pom.xml b/java/sca/modules/implementation-osgi/pom.xml
index c3615148a9..305d1d3c40 100644
--- a/java/sca/modules/implementation-osgi/pom.xml
+++ b/java/sca/modules/implementation-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-resource-runtime/pom.xml b/java/sca/modules/implementation-resource-runtime/pom.xml
index 33270149b5..1202459fba 100644
--- a/java/sca/modules/implementation-resource-runtime/pom.xml
+++ b/java/sca/modules/implementation-resource-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-resource/pom.xml b/java/sca/modules/implementation-resource/pom.xml
index a68a08cd18..bfc244e65d 100644
--- a/java/sca/modules/implementation-resource/pom.xml
+++ b/java/sca/modules/implementation-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/java/sca/modules/implementation-script/pom.xml b/java/sca/modules/implementation-script/pom.xml
index 0d61f8c58f..7f1806c821 100644
--- a/java/sca/modules/implementation-script/pom.xml
+++ b/java/sca/modules/implementation-script/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

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

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

        <dependency>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/modules/implementation-spring/pom.xml b/java/sca/modules/implementation-spring/pom.xml
index 94d2099659..6b530c6765 100644
--- a/java/sca/modules/implementation-spring/pom.xml
+++ b/java/sca/modules/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring</artifactId>
@@ -32,55 +32,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <!-- Temporarily depend on implementation-script for a set of utility classes -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                 
         <!-- Spring dependencies... -->    
diff --git a/java/sca/modules/implementation-web-runtime/pom.xml b/java/sca/modules/implementation-web-runtime/pom.xml
index f48eedc6d4..ecad6b888d 100644
--- a/java/sca/modules/implementation-web-runtime/pom.xml
+++ b/java/sca/modules/implementation-web-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/modules/implementation-web/pom.xml b/java/sca/modules/implementation-web/pom.xml
index 68dffedcc5..cdc68c49db 100644
--- a/java/sca/modules/implementation-web/pom.xml
+++ b/java/sca/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-assembly</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-contribution-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope> 

         </dependency>

 

diff --git a/java/sca/modules/implementation-widget-runtime/pom.xml b/java/sca/modules/implementation-widget-runtime/pom.xml
index d374057fd8..0e25eaf5ca 100644
--- a/java/sca/modules/implementation-widget-runtime/pom.xml
+++ b/java/sca/modules/implementation-widget-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,39 +33,39 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -80,14 +80,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/java/sca/modules/implementation-widget/pom.xml b/java/sca/modules/implementation-widget/pom.xml
index f9aca74872..98cfd880ea 100644
--- a/java/sca/modules/implementation-widget/pom.xml
+++ b/java/sca/modules/implementation-widget/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/java/sca/modules/implementation-xquery/pom.xml b/java/sca/modules/implementation-xquery/pom.xml
index 10a35783e7..0985cd0463 100644
--- a/java/sca/modules/implementation-xquery/pom.xml
+++ b/java/sca/modules/implementation-xquery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,44 +33,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/modules/interface-java-jaxws/pom.xml b/java/sca/modules/interface-java-jaxws/pom.xml
index e3a72f6fec..1a38de41ed 100644
--- a/java/sca/modules/interface-java-jaxws/pom.xml
+++ b/java/sca/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/interface-java-xml/pom.xml b/java/sca/modules/interface-java-xml/pom.xml
index 989e7bd6ae..bc92bdc156 100644
--- a/java/sca/modules/interface-java-xml/pom.xml
+++ b/java/sca/modules/interface-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/java/sca/modules/interface-java/pom.xml b/java/sca/modules/interface-java/pom.xml
index bab2576ea8..39e96a4ce8 100644
--- a/java/sca/modules/interface-java/pom.xml
+++ b/java/sca/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/java/sca/modules/interface-wsdl-xml/pom.xml b/java/sca/modules/interface-wsdl-xml/pom.xml
index 62b224c586..8a043b41ca 100644
--- a/java/sca/modules/interface-wsdl-xml/pom.xml
+++ b/java/sca/modules/interface-wsdl-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/java/sca/modules/interface-wsdl/pom.xml b/java/sca/modules/interface-wsdl/pom.xml
index bb1e630b0a..65a1b957c5 100644
--- a/java/sca/modules/interface-wsdl/pom.xml
+++ b/java/sca/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/java/sca/modules/interface/pom.xml b/java/sca/modules/interface/pom.xml
index 7c75e66767..2a1827efa0 100644
--- a/java/sca/modules/interface/pom.xml
+++ b/java/sca/modules/interface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/java/sca/modules/monitor-logging/pom.xml b/java/sca/modules/monitor-logging/pom.xml
index 32dd2fc235..21c079ef48 100644
--- a/java/sca/modules/monitor-logging/pom.xml
+++ b/java/sca/modules/monitor-logging/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>         
  
     </dependencies>
diff --git a/java/sca/modules/monitor/pom.xml b/java/sca/modules/monitor/pom.xml
index 44990c4c02..2a899db04c 100644
--- a/java/sca/modules/monitor/pom.xml
+++ b/java/sca/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/modules/node-api/pom.xml b/java/sca/modules/node-api/pom.xml
index 02210daa88..2244857560 100644
--- a/java/sca/modules/node-api/pom.xml
+++ b/java/sca/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/java/sca/modules/node-dynamic/pom.xml b/java/sca/modules/node-dynamic/pom.xml
index 91fbc9e025..8be793be13 100644
--- a/java/sca/modules/node-dynamic/pom.xml
+++ b/java/sca/modules/node-dynamic/pom.xml
@@ -23,7 +23,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>          

      

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>          

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>          

 

diff --git a/java/sca/modules/node-impl/pom.xml b/java/sca/modules/node-impl/pom.xml
index f932c9abc4..6ae64d26ba 100644
--- a/java/sca/modules/node-impl/pom.xml
+++ b/java/sca/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,98 +35,98 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
               
diff --git a/java/sca/modules/node-launcher-equinox/pom.xml b/java/sca/modules/node-launcher-equinox/pom.xml
index 8c4735d537..04b165b157 100644
--- a/java/sca/modules/node-launcher-equinox/pom.xml
+++ b/java/sca/modules/node-launcher-equinox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -55,35 +55,35 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/node-launcher-osgi/pom.xml b/java/sca/modules/node-launcher-osgi/pom.xml
index d5754530c9..7f8643af92 100644
--- a/java/sca/modules/node-launcher-osgi/pom.xml
+++ b/java/sca/modules/node-launcher-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -57,41 +57,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
               
diff --git a/java/sca/modules/node-launcher-webapp/pom.xml b/java/sca/modules/node-launcher-webapp/pom.xml
index c0c911e63a..c1604279be 100644
--- a/java/sca/modules/node-launcher-webapp/pom.xml
+++ b/java/sca/modules/node-launcher-webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/node-launcher/pom.xml b/java/sca/modules/node-launcher/pom.xml
index 606a4f9164..862b31ad44 100644
--- a/java/sca/modules/node-launcher/pom.xml
+++ b/java/sca/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/modules/node-manager/pom.xml b/java/sca/modules/node-manager/pom.xml
index 73dcfae7ea..334a3bd3d2 100644
--- a/java/sca/modules/node-manager/pom.xml
+++ b/java/sca/modules/node-manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -82,28 +82,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/modules/osgi-runtime/pom.xml b/java/sca/modules/osgi-runtime/pom.xml
index 2b90e85d2d..d7e07e0bec 100644
--- a/java/sca/modules/osgi-runtime/pom.xml
+++ b/java/sca/modules/osgi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-osgi-runtime</artifactId>
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -66,4 +66,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/modules/policy-logging/pom.xml b/java/sca/modules/policy-logging/pom.xml
index 8e2659f171..41ae72d72a 100644
--- a/java/sca/modules/policy-logging/pom.xml
+++ b/java/sca/modules/policy-logging/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/modules/policy-reliability/pom.xml b/java/sca/modules/policy-reliability/pom.xml
index b1cf5a48bb..92c02d2bd4 100644
--- a/java/sca/modules/policy-reliability/pom.xml
+++ b/java/sca/modules/policy-reliability/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/modules/policy-security-jsr250/pom.xml b/java/sca/modules/policy-security-jsr250/pom.xml
index 467742f575..f92057944b 100644
--- a/java/sca/modules/policy-security-jsr250/pom.xml
+++ b/java/sca/modules/policy-security-jsr250/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/modules/policy-security/pom.xml b/java/sca/modules/policy-security/pom.xml
index e9d952cd31..efc3754fff 100644
--- a/java/sca/modules/policy-security/pom.xml
+++ b/java/sca/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

                 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

     </dependencies>

diff --git a/java/sca/modules/policy-transaction/pom.xml b/java/sca/modules/policy-transaction/pom.xml
index 42f4005306..46cbbc38c9 100644
--- a/java/sca/modules/policy-transaction/pom.xml
+++ b/java/sca/modules/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/java/sca/modules/policy-xml-ws/pom.xml b/java/sca/modules/policy-xml-ws/pom.xml
index 039dc83538..dcc39b9cad 100644
--- a/java/sca/modules/policy-xml-ws/pom.xml
+++ b/java/sca/modules/policy-xml-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/policy-xml/pom.xml b/java/sca/modules/policy-xml/pom.xml
index 0934c768df..a6ff04d218 100644
--- a/java/sca/modules/policy-xml/pom.xml
+++ b/java/sca/modules/policy-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/java/sca/modules/policy/pom.xml b/java/sca/modules/policy/pom.xml
index 2c76db7f89..f94a18ee35 100644
--- a/java/sca/modules/policy/pom.xml
+++ b/java/sca/modules/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 0a228011f9..2496bc13b5 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/java/sca/modules/runtime-standalone/pom.xml b/java/sca/modules/runtime-standalone/pom.xml
index 8531019d16..d1edd1839c 100644
--- a/java/sca/modules/runtime-standalone/pom.xml
+++ b/java/sca/modules/runtime-standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-runtime-standalone</artifactId>
diff --git a/java/sca/modules/runtime-tomcat/pom.xml b/java/sca/modules/runtime-tomcat/pom.xml
index 6d15f1455e..840fc5467b 100644
--- a/java/sca/modules/runtime-tomcat/pom.xml
+++ b/java/sca/modules/runtime-tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-runtime-tomcat</artifactId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-runtime</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
             <exclusions>
                <exclusion>
                   <groupId>org.apache.tuscany.sca</groupId>
@@ -72,13 +72,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-jms</artifactId>
-	        <version>1.4-SNAPSHOT</version>
+	        <version>2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/java/sca/modules/runtime-war/pom.xml b/java/sca/modules/runtime-war/pom.xml
index 44e66c6510..fba34897d0 100644
--- a/java/sca/modules/runtime-war/pom.xml
+++ b/java/sca/modules/runtime-war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/modules/runtime/pom.xml b/java/sca/modules/runtime/pom.xml
index 832abe7bb6..2f6534b599 100644
--- a/java/sca/modules/runtime/pom.xml
+++ b/java/sca/modules/runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -199,25 +199,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         <dependency>
diff --git a/java/sca/modules/runtime2/pom.xml b/java/sca/modules/runtime2/pom.xml
index dbf55df4e3..0091b374ed 100644
--- a/java/sca/modules/runtime2/pom.xml
+++ b/java/sca/modules/runtime2/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

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

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

             <artifactId>tuscany-contribution</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-contribution-java</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-contribution-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-endpoint</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-extensibility</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-monitor</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-monitor-logging</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/java/sca/modules/sca-api/pom.xml b/java/sca/modules/sca-api/pom.xml
index 54e43ce91c..13f1fb85c1 100644
--- a/java/sca/modules/sca-api/pom.xml
+++ b/java/sca/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/java/sca/modules/scdl4j/pom.xml b/java/sca/modules/scdl4j/pom.xml
index b259e339e5..43a25a7de7 100644
--- a/java/sca/modules/scdl4j/pom.xml
+++ b/java/sca/modules/scdl4j/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

 

diff --git a/java/sca/modules/thirdparty-library/pom.xml b/java/sca/modules/thirdparty-library/pom.xml
index a866958ffa..95be34a11f 100644
--- a/java/sca/modules/thirdparty-library/pom.xml
+++ b/java/sca/modules/thirdparty-library/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-thirdparty-library</artifactId>
@@ -85,4 +85,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/modules/tracing-aspectj/pom.xml b/java/sca/modules/tracing-aspectj/pom.xml
index 00790ed621..616138d155 100644
--- a/java/sca/modules/tracing-aspectj/pom.xml
+++ b/java/sca/modules/tracing-aspectj/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>tuscany-tracing-aspectj</artifactId>

@@ -107,4 +107,4 @@
             </plugin>

         </plugins>

     </build>

-</project>
\ No newline at end of file
+</project>

diff --git a/java/sca/modules/workspace-impl/pom.xml b/java/sca/modules/workspace-impl/pom.xml
index da61ef8660..a756669b02 100644
--- a/java/sca/modules/workspace-impl/pom.xml
+++ b/java/sca/modules/workspace-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/java/sca/modules/workspace-xml/pom.xml b/java/sca/modules/workspace-xml/pom.xml
index 0fce4fa60e..a1b1547b2a 100644
--- a/java/sca/modules/workspace-xml/pom.xml
+++ b/java/sca/modules/workspace-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/workspace/pom.xml b/java/sca/modules/workspace/pom.xml
index 751b17b59f..766a69b5b8 100644
--- a/java/sca/modules/workspace/pom.xml
+++ b/java/sca/modules/workspace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/java/sca/modules/xsd-xml/pom.xml b/java/sca/modules/xsd-xml/pom.xml
index 6361a5254c..0dc5bd28fa 100644
--- a/java/sca/modules/xsd-xml/pom.xml
+++ b/java/sca/modules/xsd-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-xsd</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

 

diff --git a/java/sca/modules/xsd/pom.xml b/java/sca/modules/xsd/pom.xml
index c8a9e21576..e7a357af17 100644
--- a/java/sca/modules/xsd/pom.xml
+++ b/java/sca/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/java/sca/pom.xml b/java/sca/pom.xml
index 15a59a0885..f0c405cd3b 100644
--- a/java/sca/pom.xml
+++ b/java/sca/pom.xml
@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project</name>
     <url>http://tuscany.apache.org</url>
-    <version>1.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/java/sca</connection>
@@ -268,7 +268,7 @@
                 <plugin>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-maven-osgi-junit</artifactId>
-                    <version>1.4-SNAPSHOT</version>
+                    <version>2.0-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <id>osgi-test</id>
@@ -296,7 +296,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-dependency-lister</artifactId>
-                        <version>1.4-SNAPSHOT</version>
+                        <version>2.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
diff --git a/java/sca/samples/binding-echo-extension/pom.xml b/java/sca/samples/binding-echo-extension/pom.xml
index 7f22540507..5d5ba0865f 100644
--- a/java/sca/samples/binding-echo-extension/pom.xml
+++ b/java/sca/samples/binding-echo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/samples/binding-echo/pom.xml b/java/sca/samples/binding-echo/pom.xml
index 1959dd9cd0..f5e2464563 100644
--- a/java/sca/samples/binding-echo/pom.xml
+++ b/java/sca/samples/binding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo-extension</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/java/sca/samples/binding-notification-broker/pom.xml b/java/sca/samples/binding-notification-broker/pom.xml
index f925f0f752..82e79c24f5 100644
--- a/java/sca/samples/binding-notification-broker/pom.xml
+++ b/java/sca/samples/binding-notification-broker/pom.xml
@@ -22,54 +22,54 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-broker</artifactId>

     <name>Apache Tuscany SCA Notification Binding Broker Sample</name>

-    <version>1.4-SNAPSHOT</version>

+    <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <!-- test dependencies -->

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>  

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>     

         <!-- test dependencies -->

diff --git a/java/sca/samples/binding-notification-consumer/pom.xml b/java/sca/samples/binding-notification-consumer/pom.xml
index b293b07373..c1452f7d02 100644
--- a/java/sca/samples/binding-notification-consumer/pom.xml
+++ b/java/sca/samples/binding-notification-consumer/pom.xml
@@ -22,60 +22,60 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-consumer</artifactId>

     <name>Apache Tuscany SCA Notification Binding Consumer Sample</name>

-    <version>1.4-SNAPSHOT</version>

+    <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/java/sca/samples/binding-notification-producer/pom.xml b/java/sca/samples/binding-notification-producer/pom.xml
index 262cb0b8b0..ffe90c0cb3 100644
--- a/java/sca/samples/binding-notification-producer/pom.xml
+++ b/java/sca/samples/binding-notification-producer/pom.xml
@@ -22,46 +22,46 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-binding-notification-producer</artifactId>

     <name>Apache Tuscany SCA Notification Binding Producer Sample</name>

-    <version>1.4-SNAPSHOT</version>

+    <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/java/sca/samples/calculator-corba-reference/pom.xml b/java/sca/samples/calculator-corba-reference/pom.xml
index 15ed3cf4eb..96d4ce402c 100644
--- a/java/sca/samples/calculator-corba-reference/pom.xml
+++ b/java/sca/samples/calculator-corba-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 	<dependency>

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

             <artifactId>tuscany-host-corba-jse</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/java/sca/samples/calculator-corba-service/pom.xml b/java/sca/samples/calculator-corba-service/pom.xml
index 88fdedec61..63c5f5f9a6 100644
--- a/java/sca/samples/calculator-corba-service/pom.xml
+++ b/java/sca/samples/calculator-corba-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 	<dependency>

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

             <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/java/sca/samples/calculator-distributed/pom.xml b/java/sca/samples/calculator-distributed/pom.xml
index 27fc715492..e1e86d8896 100644
--- a/java/sca/samples/calculator-distributed/pom.xml
+++ b/java/sca/samples/calculator-distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                                        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/java/sca/samples/calculator-implementation-policies/pom.xml b/java/sca/samples/calculator-implementation-policies/pom.xml
index 9456bbf35e..7bc0be2dca 100644
--- a/java/sca/samples/calculator-implementation-policies/pom.xml
+++ b/java/sca/samples/calculator-implementation-policies/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

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

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

             <artifactId>tuscany-policy-logging</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/calculator-lean/pom.xml b/java/sca/samples/calculator-lean/pom.xml
index 6fc55d3160..a68887b9b5 100644
--- a/java/sca/samples/calculator-lean/pom.xml
+++ b/java/sca/samples/calculator-lean/pom.xml
@@ -1,71 +1,71 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator-lean</artifactId>
-    <name>Apache Tuscany SCA Calculator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</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>tuscany-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>sample-calculator-lean</artifactId>

+    <name>Apache Tuscany SCA Calculator Sample</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

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

+    </build>

+</project>

diff --git a/java/sca/samples/calculator-osgi/pom.xml b/java/sca/samples/calculator-osgi/pom.xml
index 4edb0b80a2..d0c0c00e83 100644
--- a/java/sca/samples/calculator-osgi/pom.xml
+++ b/java/sca/samples/calculator-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-osgi</artifactId>
@@ -39,41 +39,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>   
         
diff --git a/java/sca/samples/calculator-rcp/pom.xml b/java/sca/samples/calculator-rcp/pom.xml
index c9e0474ceb..0e5214cdd0 100644
--- a/java/sca/samples/calculator-rcp/pom.xml
+++ b/java/sca/samples/calculator-rcp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample.calculator.rcp</artifactId>
@@ -38,36 +38,36 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- 
@@ -123,4 +123,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/samples/calculator-rmi-reference/pom.xml b/java/sca/samples/calculator-rmi-reference/pom.xml
index 33e8345ffc..110a192f72 100644
--- a/java/sca/samples/calculator-rmi-reference/pom.xml
+++ b/java/sca/samples/calculator-rmi-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/java/sca/samples/calculator-rmi-service/pom.xml b/java/sca/samples/calculator-rmi-service/pom.xml
index 3b2102366c..0ce5d94a76 100644
--- a/java/sca/samples/calculator-rmi-service/pom.xml
+++ b/java/sca/samples/calculator-rmi-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/java/sca/samples/calculator-script/pom.xml b/java/sca/samples/calculator-script/pom.xml
index a628979a7b..4ed19c0751 100644
--- a/java/sca/samples/calculator-script/pom.xml
+++ b/java/sca/samples/calculator-script/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/calculator-webapp/pom.xml b/java/sca/samples/calculator-webapp/pom.xml
index 6d7c2eb8aa..add604d80e 100644
--- a/java/sca/samples/calculator-webapp/pom.xml
+++ b/java/sca/samples/calculator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 03f9e1e8ce..57d39cd8d8 100644
--- a/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
     </d:environment>
diff --git a/java/sca/samples/calculator-ws-secure-webapp/pom.xml b/java/sca/samples/calculator-ws-secure-webapp/pom.xml
index 01c19e0ae4..c6d24f4806 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/pom.xml
+++ b/java/sca/samples/calculator-ws-secure-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-calculator-ws-secure-webapp</artifactId>

@@ -42,19 +42,19 @@ WS Security and in a WebApp</name>
         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -88,7 +88,7 @@ WS Security and in a WebApp</name>
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 9b2a05d582..d5c02e354d 100644
--- a/java/sca/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>

+            <d:version>2.0-SNAPSHOT</d:version>

             <d:type>war</d:type>

         </d:moduleId>

         <!-- TUSCANY-1986 -->

diff --git a/java/sca/samples/calculator-ws-webapp/pom.xml b/java/sca/samples/calculator-ws-webapp/pom.xml
index 6218609674..e0543d94a8 100644
--- a/java/sca/samples/calculator-ws-webapp/pom.xml
+++ b/java/sca/samples/calculator-ws-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 5da8c962a0..59bbb0de83 100644
--- a/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/java/sca/samples/calculator/pom.xml b/java/sca/samples/calculator/pom.xml
index 45ac5c7810..814b212722 100644
--- a/java/sca/samples/calculator/pom.xml
+++ b/java/sca/samples/calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/calculator2/pom.xml b/java/sca/samples/calculator2/pom.xml
index fd6aaefdc7..1f95585cbe 100644
--- a/java/sca/samples/calculator2/pom.xml
+++ b/java/sca/samples/calculator2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator2</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-scdl4j</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-runtime2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/callback-ws-client/pom.xml b/java/sca/samples/callback-ws-client/pom.xml
index c25207917a..4ac9e6cf81 100644
--- a/java/sca/samples/callback-ws-client/pom.xml
+++ b/java/sca/samples/callback-ws-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>        

 

diff --git a/java/sca/samples/callback-ws-service/pom.xml b/java/sca/samples/callback-ws-service/pom.xml
index 19d18334c3..e39b4480a7 100644
--- a/java/sca/samples/callback-ws-service/pom.xml
+++ b/java/sca/samples/callback-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>      

 

diff --git a/java/sca/samples/callbacks-jms/pom.xml b/java/sca/samples/callbacks-jms/pom.xml
index 5d7b1453b4..d7bef36033 100644
--- a/java/sca/samples/callbacks-jms/pom.xml
+++ b/java/sca/samples/callbacks-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-callbacks-jms</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 -->

diff --git a/java/sca/samples/chat-webapp/pom.xml b/java/sca/samples/chat-webapp/pom.xml
index 50be91f202..93fa269cf4 100644
--- a/java/sca/samples/chat-webapp/pom.xml
+++ b/java/sca/samples/chat-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/samples/chat2-webapp/pom.xml b/java/sca/samples/chat2-webapp/pom.xml
index c9def0ae48..e35891561b 100644
--- a/java/sca/samples/chat2-webapp/pom.xml
+++ b/java/sca/samples/chat2-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-chat2-webapp</artifactId>
@@ -41,27 +41,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/samples/customer-dojo-webapp/pom.xml b/java/sca/samples/customer-dojo-webapp/pom.xml
index 4f5117e556..29da8e9eaf 100644
--- a/java/sca/samples/customer-dojo-webapp/pom.xml
+++ b/java/sca/samples/customer-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-customer-dojo-webapp</artifactId>
@@ -40,33 +40,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
          </dependency>
 		         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                         
@@ -167,7 +167,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index ca61ed1d63..3e72bf29a4 100644
--- a/java/sca/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/java/sca/samples/customer-dojo/pom.xml b/java/sca/samples/customer-dojo/pom.xml
index 1e4305d9ce..7d8a0d027c 100644
--- a/java/sca/samples/customer-dojo/pom.xml
+++ b/java/sca/samples/customer-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
                 
 		<dependency>
@@ -179,7 +179,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/samples/databinding-echo/pom.xml b/java/sca/samples/databinding-echo/pom.xml
index ecb491f718..3010c7e89e 100644
--- a/java/sca/samples/databinding-echo/pom.xml
+++ b/java/sca/samples/databinding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>          
 
         <dependency>
diff --git a/java/sca/samples/domain-management/pom.xml b/java/sca/samples/domain-management/pom.xml
index 0dff72408a..a64e411922 100644
--- a/java/sca/samples/domain-management/pom.xml
+++ b/java/sca/samples/domain-management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-domain-management</artifactId>
@@ -39,79 +39,79 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -124,48 +124,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -184,7 +184,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/samples/domain-webapp/pom.xml b/java/sca/samples/domain-webapp/pom.xml
index 58fa5a7458..0b4309a244 100644
--- a/java/sca/samples/domain-webapp/pom.xml
+++ b/java/sca/samples/domain-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-samples</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

             

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>      

         

          <dependency>

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

             <artifactId>tuscany-domain-impl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

                                       

         <dependency>

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

             <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>   

         

          <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-binding-http</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-implementation-resource</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>                 

         

diff --git a/java/sca/samples/feed-aggregator-webapp/pom.xml b/java/sca/samples/feed-aggregator-webapp/pom.xml
index a1e8be6b13..874327c7b1 100644
--- a/java/sca/samples/feed-aggregator-webapp/pom.xml
+++ b/java/sca/samples/feed-aggregator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/samples/feed-aggregator/pom.xml b/java/sca/samples/feed-aggregator/pom.xml
index e4e6fdf37a..ae2aee112c 100644
--- a/java/sca/samples/feed-aggregator/pom.xml
+++ b/java/sca/samples/feed-aggregator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/helloworld-bpel-ws/pom.xml b/java/sca/samples/helloworld-bpel-ws/pom.xml
index c20ade8d82..09cb2cbd53 100644
--- a/java/sca/samples/helloworld-bpel-ws/pom.xml
+++ b/java/sca/samples/helloworld-bpel-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-bpel-ws</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

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

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

             <artifactId>tuscany-wsdl2java</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -187,7 +187,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-wsdl2java</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <configuration>

diff --git a/java/sca/samples/helloworld-bpel/pom.xml b/java/sca/samples/helloworld-bpel/pom.xml
index b864ada85f..d93676d77d 100644
--- a/java/sca/samples/helloworld-bpel/pom.xml
+++ b/java/sca/samples/helloworld-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
                 
         <dependency>
@@ -180,7 +180,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.4-SNAPSHOT</version>
+				<version>2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml b/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
index 94b44edb40..1cdedf7d15 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
+++ b/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-node</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-dynamic</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml b/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml
index ee51fd55db..b298c4eb62 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ b/java/sca/samples/helloworld-distributed/helloworld-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-webapp</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -64,7 +64,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/samples/helloworld-dojo-webapp/pom.xml b/java/sca/samples/helloworld-dojo-webapp/pom.xml
index 355d325cef..d839ecddc6 100644
--- a/java/sca/samples/helloworld-dojo-webapp/pom.xml
+++ b/java/sca/samples/helloworld-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -146,7 +146,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/samples/helloworld-jms-webapp/pom.xml b/java/sca/samples/helloworld-jms-webapp/pom.xml
index 48ff33be2d..c2d6155233 100644
--- a/java/sca/samples/helloworld-jms-webapp/pom.xml
+++ b/java/sca/samples/helloworld-jms-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-jms-webapp</artifactId>
diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml b/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
index 1a6a672d39..9d3b27d8cc 100644
--- a/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/samples/helloworld-jsp/pom.xml b/java/sca/samples/helloworld-jsp/pom.xml
index 05c303a013..c2604065ca 100644
--- a/java/sca/samples/helloworld-jsp/pom.xml
+++ b/java/sca/samples/helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-jsp</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-reference-jms/pom.xml b/java/sca/samples/helloworld-reference-jms/pom.xml
index 8c9b704c49..77d887509c 100644
--- a/java/sca/samples/helloworld-reference-jms/pom.xml
+++ b/java/sca/samples/helloworld-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-reference-jms</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-service-jms</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/java/sca/samples/helloworld-service-jms/pom.xml b/java/sca/samples/helloworld-service-jms/pom.xml
index a80a32fc08..c2be08fa75 100644
--- a/java/sca/samples/helloworld-service-jms/pom.xml
+++ b/java/sca/samples/helloworld-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-service-jms</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

         

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>   

 

diff --git a/java/sca/samples/helloworld-servlet/pom.xml b/java/sca/samples/helloworld-servlet/pom.xml
index 84494d1598..26fa4e62d2 100644
--- a/java/sca/samples/helloworld-servlet/pom.xml
+++ b/java/sca/samples/helloworld-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-servlet</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-web-callback/pom.xml b/java/sca/samples/helloworld-web-callback/pom.xml
index 54b422d64f..4a15d1a8ea 100644
--- a/java/sca/samples/helloworld-web-callback/pom.xml
+++ b/java/sca/samples/helloworld-web-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-web-callback</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-web/pom.xml b/java/sca/samples/helloworld-web/pom.xml
index 06b05a7c0e..48160e795a 100644
--- a/java/sca/samples/helloworld-web/pom.xml
+++ b/java/sca/samples/helloworld-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>sample-helloworld-web</artifactId>

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

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-ws-deep-webapp/pom.xml b/java/sca/samples/helloworld-ws-deep-webapp/pom.xml
index 1651656c64..0595f43ec2 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/java/sca/samples/helloworld-ws-deep-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/samples/helloworld-ws-reference-jms/pom.xml b/java/sca/samples/helloworld-ws-reference-jms/pom.xml
index 9ff43d8816..d1e77ca628 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/pom.xml
+++ b/java/sca/samples/helloworld-ws-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service-jms</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/java/sca/samples/helloworld-ws-reference-lean/pom.xml b/java/sca/samples/helloworld-ws-reference-lean/pom.xml
index f92f468ab2..ff6907f223 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/pom.xml
+++ b/java/sca/samples/helloworld-ws-reference-lean/pom.xml
@@ -1,79 +1,79 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-reference-lean</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Reference Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>1.4-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>
-    </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-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

+    <artifactId>sample-helloworld-ws-reference-lean</artifactId>

+    <name>Apache Tuscany SCA HelloWorld Web Service Reference Sample</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

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

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>sample-helloworld-ws-service</artifactId>

+            <version>2.0-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>

+    </build>

+

+</project>

diff --git a/java/sca/samples/helloworld-ws-reference-secure/pom.xml b/java/sca/samples/helloworld-ws-reference-secure/pom.xml
index 25dbc97a5d..5694276870 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/pom.xml
+++ b/java/sca/samples/helloworld-ws-reference-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-ws-service-secure</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/java/sca/samples/helloworld-ws-reference/pom.xml b/java/sca/samples/helloworld-ws-reference/pom.xml
index 35436414fb..175f7f7038 100644
--- a/java/sca/samples/helloworld-ws-reference/pom.xml
+++ b/java/sca/samples/helloworld-ws-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml b/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
index c5acb781c1..d714663dc8 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     
         <dependency>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 -->        
@@ -182,7 +182,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 9a4b963cb6..b7a7df2c17 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- Using the shared library -->
diff --git a/java/sca/samples/helloworld-ws-sdo/pom.xml b/java/sca/samples/helloworld-ws-sdo/pom.xml
index fd00661253..23c16b4981 100644
--- a/java/sca/samples/helloworld-ws-sdo/pom.xml
+++ b/java/sca/samples/helloworld-ws-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -69,14 +69,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/samples/helloworld-ws-service-jms/pom.xml b/java/sca/samples/helloworld-ws-service-jms/pom.xml
index a640cda312..90f3e7f297 100644
--- a/java/sca/samples/helloworld-ws-service-jms/pom.xml
+++ b/java/sca/samples/helloworld-ws-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

@@ -60,14 +60,14 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>    

 

diff --git a/java/sca/samples/helloworld-ws-service-secure/pom.xml b/java/sca/samples/helloworld-ws-service-secure/pom.xml
index add4af55c1..b2a1245d79 100644
--- a/java/sca/samples/helloworld-ws-service-secure/pom.xml
+++ b/java/sca/samples/helloworld-ws-service-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/helloworld-ws-service-webapp/pom.xml b/java/sca/samples/helloworld-ws-service-webapp/pom.xml
index 1fbfb2a49d..63dd133c2c 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/pom.xml
+++ b/java/sca/samples/helloworld-ws-service-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index af87f30703..c514922045 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/java/sca/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.4-SNAPSHOT</d:version>
+            <d:version>2.0-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->
diff --git a/java/sca/samples/helloworld-ws-service/pom.xml b/java/sca/samples/helloworld-ws-service/pom.xml
index 4cfb8a42c6..dbfe915e58 100644
--- a/java/sca/samples/helloworld-ws-service/pom.xml
+++ b/java/sca/samples/helloworld-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
 
diff --git a/java/sca/samples/implementation-composite/pom.xml b/java/sca/samples/implementation-composite/pom.xml
index 0ab5bdecc5..91f8af09f3 100644
--- a/java/sca/samples/implementation-composite/pom.xml
+++ b/java/sca/samples/implementation-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/java/sca/samples/implementation-crud-extension/pom.xml b/java/sca/samples/implementation-crud-extension/pom.xml
index 6a7bade0f1..6e044bd68e 100644
--- a/java/sca/samples/implementation-crud-extension/pom.xml
+++ b/java/sca/samples/implementation-crud-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/samples/implementation-crud/pom.xml b/java/sca/samples/implementation-crud/pom.xml
index 20f489bb2a..3fb4252e92 100644
--- a/java/sca/samples/implementation-crud/pom.xml
+++ b/java/sca/samples/implementation-crud/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-implementation-crud-extension</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/java/sca/samples/implementation-notification/pom.xml b/java/sca/samples/implementation-notification/pom.xml
index cffaf23893..0ebb3ff7a3 100644
--- a/java/sca/samples/implementation-notification/pom.xml
+++ b/java/sca/samples/implementation-notification/pom.xml
@@ -22,30 +22,30 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-implementation-notification</artifactId>

     <name>Apache Tuscany SCA Notification Implementation Sample</name>

-    <version>1.4-SNAPSHOT</version>

+    <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         <!-- end -->

diff --git a/java/sca/samples/implementation-pojo-extension/pom.xml b/java/sca/samples/implementation-pojo-extension/pom.xml
index d397ee7d3e..6fa7ab7f1c 100644
--- a/java/sca/samples/implementation-pojo-extension/pom.xml
+++ b/java/sca/samples/implementation-pojo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/samples/loanapplication/pom.xml b/java/sca/samples/loanapplication/pom.xml
index 0b528371a4..ad76cde4f1 100644
--- a/java/sca/samples/loanapplication/pom.xml
+++ b/java/sca/samples/loanapplication/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/samples/osgi-supplychain/pom.xml b/java/sca/samples/osgi-supplychain/pom.xml
index c01e16627b..a3140094c5 100644
--- a/java/sca/samples/osgi-supplychain/pom.xml
+++ b/java/sca/samples/osgi-supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/photo-gallery/pom.xml b/java/sca/samples/photo-gallery/pom.xml
index 2a92482241..b96a89f0fc 100644
--- a/java/sca/samples/photo-gallery/pom.xml
+++ b/java/sca/samples/photo-gallery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-photo-gallery</artifactId>
@@ -39,54 +39,54 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/pom.xml b/java/sca/samples/pom.xml
index 71bea58888..29462c513f 100644
--- a/java/sca/samples/pom.xml
+++ b/java/sca/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
diff --git a/java/sca/samples/quote-xquery/pom.xml b/java/sca/samples/quote-xquery/pom.xml
index 1d26893f6e..2fa134132c 100644
--- a/java/sca/samples/quote-xquery/pom.xml
+++ b/java/sca/samples/quote-xquery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -90,13 +90,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/simple-bigbank-spring/pom.xml b/java/sca/samples/simple-bigbank-spring/pom.xml
index 4a22fa0237..5e71de9a6b 100644
--- a/java/sca/samples/simple-bigbank-spring/pom.xml
+++ b/java/sca/samples/simple-bigbank-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -88,97 +88,97 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-spring-bigbank-checkaccount</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/samples/simple-bigbank/pom.xml b/java/sca/samples/simple-bigbank/pom.xml
index 87b5cc33d5..82cbdfe4b6 100644
--- a/java/sca/samples/simple-bigbank/pom.xml
+++ b/java/sca/samples/simple-bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/simple-callback-ws/pom.xml b/java/sca/samples/simple-callback-ws/pom.xml
index ba09ee6f2a..5b5d5e666b 100644
--- a/java/sca/samples/simple-callback-ws/pom.xml
+++ b/java/sca/samples/simple-callback-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/simple-callback/pom.xml b/java/sca/samples/simple-callback/pom.xml
index 7849657cd9..056aef6a1e 100644
--- a/java/sca/samples/simple-callback/pom.xml
+++ b/java/sca/samples/simple-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/spi-implementation-pojo/pom.xml b/java/sca/samples/spi-implementation-pojo/pom.xml
index c78d035eba..870c67b5f2 100644
--- a/java/sca/samples/spi-implementation-pojo/pom.xml
+++ b/java/sca/samples/spi-implementation-pojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/java/sca/samples/spring-bigbank-calculator/pom.xml b/java/sca/samples/spring-bigbank-calculator/pom.xml
index 37ca97bfb5..5f2b2452ab 100644
--- a/java/sca/samples/spring-bigbank-calculator/pom.xml
+++ b/java/sca/samples/spring-bigbank-calculator/pom.xml
@@ -1,81 +1,81 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-spring-bigbank-calculator</artifactId>
-    <name>Apache Tuscany SCA Spring-Based BigBank Calculator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
+<?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-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>sample-spring-bigbank-calculator</artifactId>

+    <name>Apache Tuscany SCA Spring-Based BigBank Calculator Sample</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>    

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-impl</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-script</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-spring</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-rmi-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

 

         <dependency>

             <groupId>org.springframework</groupId>

@@ -94,17 +94,17 @@
             <artifactId>spring-context</artifactId>

             <version>2.5.5</version>

         </dependency>

-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
+        

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+

+    </dependencies>

+

+    <build>

+       <finalName>${artifactId}</finalName>

+    </build>

+</project>

diff --git a/java/sca/samples/spring-bigbank-checkaccount/pom.xml b/java/sca/samples/spring-bigbank-checkaccount/pom.xml
index e4738affc8..b46074b8c8 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/pom.xml
+++ b/java/sca/samples/spring-bigbank-checkaccount/pom.xml
@@ -1,87 +1,87 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-spring-bigbank-checkaccount</artifactId>
-    <name>Apache Tuscany SCA Spring-Based BigBank Checking Accounts Sample</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>  
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+<?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-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>sample-spring-bigbank-checkaccount</artifactId>

+    <name>Apache Tuscany SCA Spring-Based BigBank Checking Accounts Sample</name>

+

+    <repositories>

+        <repository>

+            <id>apache.incubator</id>

+            <url>http://people.apache.org/repo/m2-incubating-repository</url>

+        </repository>

+    </repositories>

+

+    <dependencies>  

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-policy-security</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-core-spi</artifactId>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>

-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>

-        </dependency>
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+	    <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-spring</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-jms-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-	    <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
 

         <dependency>

             <groupId>org.springframework</groupId>

@@ -100,34 +100,34 @@
             <artifactId>spring-context</artifactId>

             <version>2.5.5</version>

         </dependency>

-        
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>  
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
+        

+        <dependency>

+            <groupId>org.apache.ws.security</groupId>

+            <artifactId>wss4j</artifactId>

+            <version>1.5.3</version>

+        </dependency>

+        

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.activemq</groupId>

+            <artifactId>apache-activemq</artifactId>

+            <version>4.1.1</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.activemq</groupId>

+                    <artifactId>activemq-web-demo</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+    </dependencies>  

+

+    <build>

+       <finalName>${artifactId}</finalName>

+    </build>

+</project>

diff --git a/java/sca/samples/spring-bigbank-stockquote/pom.xml b/java/sca/samples/spring-bigbank-stockquote/pom.xml
index 4f0ffe3db2..4bf37e88fa 100644
--- a/java/sca/samples/spring-bigbank-stockquote/pom.xml
+++ b/java/sca/samples/spring-bigbank-stockquote/pom.xml
@@ -1,81 +1,81 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-spring-bigbank-stockquote</artifactId>
-    <name>Apache Tuscany SCA Spring-Based BigBank StockQuote Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
+<?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-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>sample-spring-bigbank-stockquote</artifactId>

+    <name>Apache Tuscany SCA Spring-Based BigBank StockQuote Sample</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-impl</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-spring</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-host-tomcat</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

 

         <dependency>

             <groupId>org.springframework</groupId>

@@ -94,17 +94,17 @@
             <artifactId>spring-context</artifactId>

             <version>2.5.5</version>

         </dependency>

-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
+        

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+    </dependencies>

+    

+    <build>

+       <finalName>${artifactId}</finalName>

+    </build>

+

+</project>

diff --git a/java/sca/samples/store-distributed/pom.xml b/java/sca/samples/store-distributed/pom.xml
index affff7a26d..e812ae0b10 100644
--- a/java/sca/samples/store-distributed/pom.xml
+++ b/java/sca/samples/store-distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-distributed</artifactId>
@@ -40,66 +40,66 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/store/pom.xml b/java/sca/samples/store/pom.xml
index 33ab14804e..d68563807a 100644
--- a/java/sca/samples/store/pom.xml
+++ b/java/sca/samples/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/supplychain/pom.xml b/java/sca/samples/supplychain/pom.xml
index 58866ce1b4..2e85d79793 100644
--- a/java/sca/samples/supplychain/pom.xml
+++ b/java/sca/samples/supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/web-resource/pom.xml b/java/sca/samples/web-resource/pom.xml
index 64bc03bdc8..eaa6269819 100644
--- a/java/sca/samples/web-resource/pom.xml
+++ b/java/sca/samples/web-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/samples/zipcode-jaxws/pom.xml b/java/sca/samples/zipcode-jaxws/pom.xml
index 18023f1cf2..686b948d03 100644
--- a/java/sca/samples/zipcode-jaxws/pom.xml
+++ b/java/sca/samples/zipcode-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/tools/eclipse/features/core/pom.xml b/java/sca/tools/eclipse/features/core/pom.xml
index 30756fe9d6..9515dcf5a0 100644
--- a/java/sca/tools/eclipse/features/core/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
diff --git a/java/sca/tools/eclipse/plugins/core/pom.xml b/java/sca/tools/eclipse/plugins/core/pom.xml
index 9ae1fd1e1f..039ad973f1 100644
--- a/java/sca/tools/eclipse/plugins/core/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.core</artifactId>
diff --git a/java/sca/tools/eclipse/pom.xml b/java/sca/tools/eclipse/pom.xml
index ef096ac09b..0da8018a0a 100644
--- a/java/sca/tools/eclipse/pom.xml
+++ b/java/sca/tools/eclipse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/tools/eclipse/site/updatesite/pom.xml b/java/sca/tools/eclipse/site/updatesite/pom.xml
index 32c0ec6f16..5d95091205 100644
--- a/java/sca/tools/eclipse/site/updatesite/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/java/sca/tools/eclipse34/features/core/pom.xml b/java/sca/tools/eclipse34/features/core/pom.xml
index 953eb9ec77..f2f273bb65 100644
--- a/java/sca/tools/eclipse34/features/core/pom.xml
+++ b/java/sca/tools/eclipse34/features/core/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
-    <name>Apache Tuscany SCA Core Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.core</artifactId>

+    <name>Apache Tuscany SCA Core Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/features/ejava/pom.xml b/java/sca/tools/eclipse34/features/ejava/pom.xml
index da67d110b7..36fa3c4e47 100644
--- a/java/sca/tools/eclipse34/features/ejava/pom.xml
+++ b/java/sca/tools/eclipse34/features/ejava/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>

+    <name>Apache Tuscany SCA JEE Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/features/manager/pom.xml b/java/sca/tools/eclipse34/features/manager/pom.xml
index 2e4f221ef1..520b252773 100644
--- a/java/sca/tools/eclipse34/features/manager/pom.xml
+++ b/java/sca/tools/eclipse34/features/manager/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>

+    <name>Apache Tuscany SCA Domain Manager Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/features/process/pom.xml b/java/sca/tools/eclipse34/features/process/pom.xml
index 9ad398109a..cb09cf3cd4 100644
--- a/java/sca/tools/eclipse34/features/process/pom.xml
+++ b/java/sca/tools/eclipse34/features/process/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.process</artifactId>
-    <name>Apache Tuscany SCA Process Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.process</artifactId>

+    <name>Apache Tuscany SCA Process Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/features/web20/pom.xml b/java/sca/tools/eclipse34/features/web20/pom.xml
index 9d4b4d50b5..3045db912f 100644
--- a/java/sca/tools/eclipse34/features/web20/pom.xml
+++ b/java/sca/tools/eclipse34/features/web20/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>
-    <name>Apache Tuscany SCA Web 2.0 Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>

+    <name>Apache Tuscany SCA Web 2.0 Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/features/webservice/pom.xml b/java/sca/tools/eclipse34/features/webservice/pom.xml
index f42fa8ce48..0929fef267 100644
--- a/java/sca/tools/eclipse34/features/webservice/pom.xml
+++ b/java/sca/tools/eclipse34/features/webservice/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Eclipse Feature</name>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>

+    <name>Apache Tuscany SCA Web Service Eclipse Feature</name>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/core/pom.xml b/java/sca/tools/eclipse34/plugins/core/pom.xml
index b32ec079d4..aeebc99265 100644
--- a/java/sca/tools/eclipse34/plugins/core/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/core/pom.xml
@@ -1,123 +1,123 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-    <name>Apache Tuscany SCA Core Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+    <name>Apache Tuscany SCA Core Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/ejava/pom.xml b/java/sca/tools/eclipse34/plugins/ejava/pom.xml
index 752d20f7c1..e4ae5928c7 100644
--- a/java/sca/tools/eclipse34/plugins/ejava/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/ejava/pom.xml
@@ -1,129 +1,129 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>

+    <name>Apache Tuscany SCA JEE Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-ejava</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-ejava</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/manager/pom.xml b/java/sca/tools/eclipse34/plugins/manager/pom.xml
index ae6b3516a2..cd9687ef63 100644
--- a/java/sca/tools/eclipse34/plugins/manager/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/manager/pom.xml
@@ -1,129 +1,129 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>

+    <name>Apache Tuscany SCA Domain Manager Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-manager</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-manager</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/process/pom.xml b/java/sca/tools/eclipse34/plugins/process/pom.xml
index 5e7366c07b..8370009115 100644
--- a/java/sca/tools/eclipse34/plugins/process/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/process/pom.xml
@@ -1,129 +1,129 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>
-    <name>Apache Tuscany SCA Process Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>

+    <name>Apache Tuscany SCA Process Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-process</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-process</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/web20/pom.xml b/java/sca/tools/eclipse34/plugins/web20/pom.xml
index 7c450e753e..74494328c3 100644
--- a/java/sca/tools/eclipse34/plugins/web20/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/web20/pom.xml
@@ -1,129 +1,129 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>
-    <name>Apache Tuscany SCA Web 2.0 Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>

+    <name>Apache Tuscany SCA Web 2.0 Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-web20</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-web20</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/plugins/webservice/pom.xml b/java/sca/tools/eclipse34/plugins/webservice/pom.xml
index 64fb36a15d..5fd08b68ff 100644
--- a/java/sca/tools/eclipse34/plugins/webservice/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/webservice/pom.xml
@@ -1,129 +1,129 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</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-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>

+    <name>Apache Tuscany SCA Web Service Eclipse Plugin</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse.jdt.debug</groupId>

+            <artifactId>ui</artifactId>

+            <version>3.2.100-v20070531-1800</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.eclipse.swt.win32.win32</groupId>

+            <artifactId>x86</artifactId>

+            <version>3.3.0-v3346</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-webservice</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <type>zip</type>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-webservice</artifactId>

+            <version>2.0-SNAPSHOT</version>

+            <classifier>src</classifier>

+            <type>zip</type>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+           <plugin>

+               <groupId>org.apache.maven.plugins</groupId>

+               <artifactId>maven-jar-plugin</artifactId>

+               <configuration>

+                   <classifier>tmp</classifier>

+                   <archive>

+                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                   </archive>

+               </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>distribution-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <appendAssemblyId>false</appendAssemblyId>

+                            <archive>

+                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                            </archive>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <repositories>

+        <repository>

+            <id>repo1.eclipse</id>

+            <url>http://repo1.maven.org/eclipse/</url>

+            <snapshots>

+                <enabled>true</enabled>

+            </snapshots>

+        </repository>

+    </repositories>

+

+</project>

diff --git a/java/sca/tools/eclipse34/pom.xml b/java/sca/tools/eclipse34/pom.xml
index a8da59b478..e5978c6be4 100644
--- a/java/sca/tools/eclipse34/pom.xml
+++ b/java/sca/tools/eclipse34/pom.xml
@@ -1,57 +1,57 @@
-<?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-sca-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <packaging>pom</packaging>
-    <artifactId>tuscany-sca-eclipse-tools</artifactId>
-    <name>Apache Tuscany SCA Eclipse Tools</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>features/core</module>
-                <module>features/ejava</module>
-                <module>features/manager</module>
-                <module>features/process</module>
-                <module>features/web20</module>
-                <module>features/webservice</module>
-                <module>plugins/core</module>
-                <module>plugins/ejava</module>
-                <module>plugins/manager</module>
-                <module>plugins/process</module>
-                <module>plugins/web20</module>
-                <module>plugins/webservice</module>
-                <module>site/updatesite</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</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-sca-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+

+    <packaging>pom</packaging>

+    <artifactId>tuscany-sca-eclipse-tools</artifactId>

+    <name>Apache Tuscany SCA Eclipse Tools</name>

+

+    <profiles>

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>features/core</module>

+                <module>features/ejava</module>

+                <module>features/manager</module>

+                <module>features/process</module>

+                <module>features/web20</module>

+                <module>features/webservice</module>

+                <module>plugins/core</module>

+                <module>plugins/ejava</module>

+                <module>plugins/manager</module>

+                <module>plugins/process</module>

+                <module>plugins/web20</module>

+                <module>plugins/webservice</module>

+                <module>site/updatesite</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/tools/eclipse34/site/updatesite/pom.xml b/java/sca/tools/eclipse34/site/updatesite/pom.xml
index 0ef2f84873..7d09e62517 100644
--- a/java/sca/tools/eclipse34/site/updatesite/pom.xml
+++ b/java/sca/tools/eclipse34/site/updatesite/pom.xml
@@ -1,145 +1,145 @@
-<?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-sca-eclipse-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
-    <name>Apache Tuscany SCA Eclipse Update Site</name>
-
-    <properties>
-        <tuscany.version>${pom.version}</tuscany.version>
-    </properties>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.process</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>updatesite-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/updatesite.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>apache-tuscany-sca-${pom.version}</finalName>
-                        </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>tuscany-sca-eclipse-tools</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>org.apache.tuscany.sca.updatesite</artifactId>

+    <name>Apache Tuscany SCA Eclipse Update Site</name>

+

+    <properties>

+        <tuscany.version>${pom.version}</tuscany.version>

+    </properties>

+    

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.core</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.process</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <build>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.*</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-assembly-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>updatesite-package</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>single</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>src/main/assembly/updatesite.xml</descriptor>

+                            </descriptors>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                            <finalName>apache-tuscany-sca-${pom.version}</finalName>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/java/sca/tools/java2wsdl/pom.xml b/java/sca/tools/java2wsdl/pom.xml
index e9c97b283c..edc3ea873d 100644
--- a/java/sca/tools/java2wsdl/pom.xml
+++ b/java/sca/tools/java2wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.stream</groupId>
@@ -171,4 +171,4 @@
             </snapshots>
         </repository>
     </repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/tools/maven/maven-ant-generator/pom.xml b/java/sca/tools/maven/maven-ant-generator/pom.xml
index 42b379cdba..35ee115ab0 100644
--- a/java/sca/tools/maven/maven-ant-generator/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-ant-generator</artifactId>
diff --git a/java/sca/tools/maven/maven-dependency-lister/pom.xml b/java/sca/tools/maven/maven-dependency-lister/pom.xml
index 7656b48a68..97de3a156f 100644
--- a/java/sca/tools/maven/maven-dependency-lister/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tuscany-maven-dependency-lister</artifactId>

diff --git a/java/sca/tools/maven/maven-incremental-build/pom.xml b/java/sca/tools/maven/maven-incremental-build/pom.xml
index e73c99b29d..854d31cbc0 100644
--- a/java/sca/tools/maven/maven-incremental-build/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-incremental-build</artifactId>
diff --git a/java/sca/tools/maven/maven-java2wsdl/pom.xml b/java/sca/tools/maven/maven-java2wsdl/pom.xml
index a9b3126cdf..1f7d12ea35 100644
--- a/java/sca/tools/maven/maven-java2wsdl/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/java/sca/tools/maven/maven-osgi-junit/pom.xml b/java/sca/tools/maven/maven-osgi-junit/pom.xml
index 2df4e01909..92607f46e6 100644
--- a/java/sca/tools/maven/maven-osgi-junit/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml
index c6e972f044..5440477dc0 100644
--- a/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-bundle-plugin</artifactId>
diff --git a/java/sca/tools/maven/maven-web-junit/pom.xml b/java/sca/tools/maven/maven-web-junit/pom.xml
index 9399bf1456..9078ba586c 100644
--- a/java/sca/tools/maven/maven-web-junit/pom.xml
+++ b/java/sca/tools/maven/maven-web-junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-web-junit</artifactId>
diff --git a/java/sca/tools/maven/maven-wsdl2java/pom.xml b/java/sca/tools/maven/maven-wsdl2java/pom.xml
index 0425f8826e..2c84f582dd 100644
--- a/java/sca/tools/maven/maven-wsdl2java/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/java/sca/tools/maven/pom.xml b/java/sca/tools/maven/pom.xml
index fe08686bdf..5dba78d863 100644
--- a/java/sca/tools/maven/pom.xml
+++ b/java/sca/tools/maven/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/tools/pom.xml b/java/sca/tools/pom.xml
index b3ab8cb275..9521117972 100644
--- a/java/sca/tools/pom.xml
+++ b/java/sca/tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tuscany-sca-tools</artifactId>

diff --git a/java/sca/tools/runtime-inspector/pom.xml b/java/sca/tools/runtime-inspector/pom.xml
index ea6078bf7d..8fc3e83948 100644
--- a/java/sca/tools/runtime-inspector/pom.xml
+++ b/java/sca/tools/runtime-inspector/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-sca-tools</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tools-runtime-inspector</artifactId>

@@ -40,19 +40,19 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-http</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

             

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/java/sca/tools/wsdl2java/pom.xml b/java/sca/tools/wsdl2java/pom.xml
index 6f13c6ca5e..629c8f33b6 100644
--- a/java/sca/tools/wsdl2java/pom.xml
+++ b/java/sca/tools/wsdl2java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -207,4 +207,4 @@
             </snapshots>
         </repository>
     </repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/java/sca/tutorials/pom.xml b/java/sca/tutorials/pom.xml
index 7491bc88cf..331a268016 100644
--- a/java/sca/tutorials/pom.xml
+++ b/java/sca/tutorials/pom.xml
@@ -1,46 +1,46 @@
-<?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-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-tutorials</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Tutorials</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>store</module>
-                <!-- <module>photo-gallery</module> -->
-            </modules>
-        </profile>
-
-    </profiles>
-
-</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-sca</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <artifactId>tuscany-tutorials</artifactId>

+    <packaging>pom</packaging>

+    <name>Apache Tuscany SCA Tutorials</name>

+

+    <profiles>

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>store</module>

+                <!-- <module>photo-gallery</module> -->

+            </modules>

+        </profile>

+

+    </profiles>

+

+</project>

diff --git a/java/sca/tutorials/store/assets/pom.xml b/java/sca/tutorials/store/assets/pom.xml
index 4902105703..befd197c3f 100644
--- a/java/sca/tutorials/store/assets/pom.xml
+++ b/java/sca/tutorials/store/assets/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/catalog-ejb/pom.xml b/java/sca/tutorials/store/catalog-ejb/pom.xml
index a71c71a708..8e8b17cecb 100644
--- a/java/sca/tutorials/store/catalog-ejb/pom.xml
+++ b/java/sca/tutorials/store/catalog-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-tutorial-store</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

 

diff --git a/java/sca/tutorials/store/catalog-mediation/pom.xml b/java/sca/tutorials/store/catalog-mediation/pom.xml
index 504908a9ab..8c508f2224 100644
--- a/java/sca/tutorials/store/catalog-mediation/pom.xml
+++ b/java/sca/tutorials/store/catalog-mediation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/catalog-webapp/pom.xml b/java/sca/tutorials/store/catalog-webapp/pom.xml
index 80a8861a99..a07d468892 100644
--- a/java/sca/tutorials/store/catalog-webapp/pom.xml
+++ b/java/sca/tutorials/store/catalog-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-tutorial-store</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-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.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tutorial-assets</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-launcher</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-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.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/java/sca/tutorials/store/domain/pom.xml b/java/sca/tutorials/store/domain/pom.xml
index be3c8c38c9..808195c491 100644
--- a/java/sca/tutorials/store/domain/pom.xml
+++ b/java/sca/tutorials/store/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-domain</artifactId>
@@ -39,90 +39,90 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/tutorials/store/pom.xml b/java/sca/tutorials/store/pom.xml
index fd44a6d3b3..69db461cfc 100644
--- a/java/sca/tutorials/store/pom.xml
+++ b/java/sca/tutorials/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorials</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tutorial-store</artifactId>
diff --git a/java/sca/tutorials/store/store-client/pom.xml b/java/sca/tutorials/store/store-client/pom.xml
index bfcc1a912b..24909223cb 100644
--- a/java/sca/tutorials/store/store-client/pom.xml
+++ b/java/sca/tutorials/store/store-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-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.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-db/pom.xml b/java/sca/tutorials/store/store-db/pom.xml
index b3ec4949ab..a7f006e8a7 100644
--- a/java/sca/tutorials/store/store-db/pom.xml
+++ b/java/sca/tutorials/store/store-db/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-eu/pom.xml b/java/sca/tutorials/store/store-eu/pom.xml
index b689c888e6..28643577d1 100644
--- a/java/sca/tutorials/store/store-eu/pom.xml
+++ b/java/sca/tutorials/store/store-eu/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-market/pom.xml b/java/sca/tutorials/store/store-market/pom.xml
index 50a931ead3..5b2aa91bda 100644
--- a/java/sca/tutorials/store/store-market/pom.xml
+++ b/java/sca/tutorials/store/store-market/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-mashup/pom.xml b/java/sca/tutorials/store/store-mashup/pom.xml
index 475620e99f..1bfaff5087 100644
--- a/java/sca/tutorials/store/store-mashup/pom.xml
+++ b/java/sca/tutorials/store/store-mashup/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-merger/pom.xml b/java/sca/tutorials/store/store-merger/pom.xml
index 5a0b6f6dec..224acad9a2 100644
--- a/java/sca/tutorials/store/store-merger/pom.xml
+++ b/java/sca/tutorials/store/store-merger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-supplier/pom.xml b/java/sca/tutorials/store/store-supplier/pom.xml
index cc0cfdd630..193ec981f6 100644
--- a/java/sca/tutorials/store/store-supplier/pom.xml
+++ b/java/sca/tutorials/store/store-supplier/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store-test/pom.xml b/java/sca/tutorials/store/store-test/pom.xml
index e3ea3e6ec4..29f9b04550 100644
--- a/java/sca/tutorials/store/store-test/pom.xml
+++ b/java/sca/tutorials/store/store-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-test</artifactId>
@@ -39,108 +39,108 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -161,7 +161,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-store-supplier</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -186,7 +186,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/store/pom.xml b/java/sca/tutorials/store/store/pom.xml
index 232b9901f7..2dcf64bba0 100644
--- a/java/sca/tutorials/store/store/pom.xml
+++ b/java/sca/tutorials/store/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/web-services/pom.xml b/java/sca/tutorials/store/web-services/pom.xml
index 43cc88510e..626fb920f9 100644
--- a/java/sca/tutorials/store/web-services/pom.xml
+++ b/java/sca/tutorials/store/web-services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/java/sca/tutorials/store/www-services/cart-amazon/pom.xml b/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
index 9b4b725746..7ba441c1f3 100644
--- a/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
+++ b/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
@@ -22,7 +22,7 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>tuscany-tutorial-store</artifactId>

-        <version>1.4-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tutorial-cart-amazon</artifactId>

@@ -33,34 +33,34 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -79,13 +79,13 @@
         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.4-SNAPSHOT</version>

+            <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -156,7 +156,7 @@
             <plugin>

                 <groupId>org.apache.tuscany.sca</groupId>

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

@@ -168,7 +168,7 @@
             <plugin>

                 <groupId>org.apache.tuscany.sca</groupId>

                 <artifactId>tuscany-maven-wsdl2java</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <configuration>

@@ -185,7 +185,7 @@
             <plugin>

                 <groupId>org.apache.tuscany.sca</groupId>

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.4-SNAPSHOT</version>

+                <version>2.0-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <configuration>

diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml b/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
index c333abafd3..20896bc089 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-amazon</artifactId>
@@ -33,48 +33,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
index a03234ec3f..9eafbd34c6 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
@@ -39,40 +39,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/java/sca/tutorials/store/www-services/pom.xml b/java/sca/tutorials/store/www-services/pom.xml
index 967cf33a79..fd02e3b29b 100644
--- a/java/sca/tutorials/store/www-services/pom.xml
+++ b/java/sca/tutorials/store/www-services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-www-services</artifactId>
diff --git a/java/sca/vtest/assembly/component/pom.xml b/java/sca/vtest/assembly/component/pom.xml
index cf38e7ab8e..b2eac429c1 100644
--- a/java/sca/vtest/assembly/component/pom.xml
+++ b/java/sca/vtest/assembly/component/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly-component</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/assembly/composite/pom.xml b/java/sca/vtest/assembly/composite/pom.xml
index 2ee14dd37f..f9922f4cac 100644
--- a/java/sca/vtest/assembly/composite/pom.xml
+++ b/java/sca/vtest/assembly/composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/assembly/ctypefile/pom.xml b/java/sca/vtest/assembly/ctypefile/pom.xml
index f1e2b3ba80..1eac774ff3 100644
--- a/java/sca/vtest/assembly/ctypefile/pom.xml
+++ b/java/sca/vtest/assembly/ctypefile/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/assembly/pom.xml b/java/sca/vtest/assembly/pom.xml
index c44ecaacd3..49e33352b4 100644
--- a/java/sca/vtest/assembly/pom.xml
+++ b/java/sca/vtest/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/vtest/java-api/annotations/conversational/pom.xml b/java/sca/vtest/java-api/annotations/conversational/pom.xml
index 2b612731fd..b9fa0ff9b9 100644
--- a/java/sca/vtest/java-api/annotations/conversational/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/conversationattributes/pom.xml b/java/sca/vtest/java-api/annotations/conversationattributes/pom.xml
index 9531468e8f..0c0236b440 100644
--- a/java/sca/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/destroy/pom.xml b/java/sca/vtest/java-api/annotations/destroy/pom.xml
index 57477d1bbb..d0e306867f 100644
--- a/java/sca/vtest/java-api/annotations/destroy/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-destroy</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/annotations/endsconversation/pom.xml b/java/sca/vtest/java-api/annotations/endsconversation/pom.xml
index 8cd14ed0a5..9c763a1111 100644
--- a/java/sca/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/init/pom.xml b/java/sca/vtest/java-api/annotations/init/pom.xml
index b2393947f8..9700b6870c 100644
--- a/java/sca/vtest/java-api/annotations/init/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-init</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/annotations/oneway/pom.xml b/java/sca/vtest/java-api/annotations/oneway/pom.xml
index 18d22a913b..99f1420712 100644
--- a/java/sca/vtest/java-api/annotations/oneway/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/pom.xml b/java/sca/vtest/java-api/annotations/pom.xml
index 2755583358..402ea03f7a 100644
--- a/java/sca/vtest/java-api/annotations/pom.xml
+++ b/java/sca/vtest/java-api/annotations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/property/pom.xml b/java/sca/vtest/java-api/annotations/property/pom.xml
index 3d4781846a..0c36e98879 100644
--- a/java/sca/vtest/java-api/annotations/property/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/reference/pom.xml b/java/sca/vtest/java-api/annotations/reference/pom.xml
index 261abb3ab9..5e88742f3e 100644
--- a/java/sca/vtest/java-api/annotations/reference/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/scope/pom.xml b/java/sca/vtest/java-api/annotations/scope/pom.xml
index d7de001183..8a905a7ebc 100644
--- a/java/sca/vtest/java-api/annotations/scope/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/annotations/service/pom.xml b/java/sca/vtest/java-api/annotations/service/pom.xml
index a5162ea4d3..4c018607d1 100644
--- a/java/sca/vtest/java-api/annotations/service/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/apis/callablereference/pom.xml b/java/sca/vtest/java-api/apis/callablereference/pom.xml
index d4af5b79db..fff1689569 100644
--- a/java/sca/vtest/java-api/apis/callablereference/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/componentcontext/pom.xml b/java/sca/vtest/java-api/apis/componentcontext/pom.xml
index 9af4b21f8a..0a2d12a41e 100644
--- a/java/sca/vtest/java-api/apis/componentcontext/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/conversation/pom.xml b/java/sca/vtest/java-api/apis/conversation/pom.xml
index 143d6f1788..e026dcc800 100644
--- a/java/sca/vtest/java-api/apis/conversation/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/exception/pom.xml b/java/sca/vtest/java-api/apis/exception/pom.xml
index e3325aaa07..ef6e5182ee 100644
--- a/java/sca/vtest/java-api/apis/exception/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/pom.xml b/java/sca/vtest/java-api/apis/pom.xml
index b1b2fc3e6b..164c67ebbb 100644
--- a/java/sca/vtest/java-api/apis/pom.xml
+++ b/java/sca/vtest/java-api/apis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/requestcontext/pom.xml b/java/sca/vtest/java-api/apis/requestcontext/pom.xml
index 7f18df910c..d849fad4fe 100644
--- a/java/sca/vtest/java-api/apis/requestcontext/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/apis/servicereference/pom.xml b/java/sca/vtest/java-api/apis/servicereference/pom.xml
index f792cff7e5..1ad6a9c2ec 100644
--- a/java/sca/vtest/java-api/apis/servicereference/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/java-api/conversation/callback/pom.xml b/java/sca/vtest/java-api/conversation/callback/pom.xml
index c8abe7ced7..656ee9c3cd 100644
--- a/java/sca/vtest/java-api/conversation/callback/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/conversation/id/pom.xml b/java/sca/vtest/java-api/conversation/id/pom.xml
index 77a52c6237..68bfdc7fe1 100644
--- a/java/sca/vtest/java-api/conversation/id/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/conversation/lifetime/pom.xml b/java/sca/vtest/java-api/conversation/lifetime/pom.xml
index 0d6c0f763c..1d4a2d3c4e 100644
--- a/java/sca/vtest/java-api/conversation/lifetime/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/conversation/parameters/pom.xml b/java/sca/vtest/java-api/conversation/parameters/pom.xml
index c6e46cb95c..dba54f0f4c 100644
--- a/java/sca/vtest/java-api/conversation/parameters/pom.xml
+++ b/java/sca/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.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/conversation/pom.xml b/java/sca/vtest/java-api/conversation/pom.xml
index 67aa9702be..08fa85c79d 100644
--- a/java/sca/vtest/java-api/conversation/pom.xml
+++ b/java/sca/vtest/java-api/conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-java-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/java/sca/vtest/java-api/pom.xml b/java/sca/vtest/java-api/pom.xml
index 198af57bbc..9b5e957b6e 100644
--- a/java/sca/vtest/java-api/pom.xml
+++ b/java/sca/vtest/java-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/vtest/pom.xml b/java/sca/vtest/pom.xml
index f4a2ebd05d..a49648244b 100644
--- a/java/sca/vtest/pom.xml
+++ b/java/sca/vtest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-vtest</artifactId>
diff --git a/java/sca/vtest/utilities/pom.xml b/java/sca/vtest/utilities/pom.xml
index de25c30cce..c4647ef2c0 100644
--- a/java/sca/vtest/utilities/pom.xml
+++ b/java/sca/vtest/utilities/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/java/sca/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/java/sca/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
index c2a276df13..93281db150 100644
--- a/java/sca/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ b/java/sca/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
index 6cdab80d1d..56356ce487 100644
--- a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/nowsdl/pom.xml b/java/sca/vtest/wsbinding/nowsdl/pom.xml
index 7167bdcc4a..e40a4270c7 100644
--- a/java/sca/vtest/wsbinding/nowsdl/pom.xml
+++ b/java/sca/vtest/wsbinding/nowsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/vtest/wsbinding/nowsdl/promoted/pom.xml b/java/sca/vtest/wsbinding/nowsdl/promoted/pom.xml
index ab19ed9034..63dc9ad5f6 100644
--- a/java/sca/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ b/java/sca/vtest/wsbinding/nowsdl/promoted/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/nowsdl/soapversion/pom.xml b/java/sca/vtest/wsbinding/nowsdl/soapversion/pom.xml
index 6345eec911..1334e35880 100644
--- a/java/sca/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ b/java/sca/vtest/wsbinding/nowsdl/soapversion/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/pom.xml b/java/sca/vtest/wsbinding/pom.xml
index e984f8b4bd..786fc89731 100644
--- a/java/sca/vtest/wsbinding/pom.xml
+++ b/java/sca/vtest/wsbinding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/vtest/wsbinding/service/pom.xml b/java/sca/vtest/wsbinding/service/pom.xml
index 3f0a2a4125..4fb8d98b57 100644
--- a/java/sca/vtest/wsbinding/service/pom.xml
+++ b/java/sca/vtest/wsbinding/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/wsdlelement/binding/pom.xml b/java/sca/vtest/wsbinding/wsdlelement/binding/pom.xml
index 205fbcc785..648aa920e8 100644
--- a/java/sca/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ b/java/sca/vtest/wsbinding/wsdlelement/binding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/wsdlelement/pom.xml b/java/sca/vtest/wsbinding/wsdlelement/pom.xml
index e1707234dc..13b0f4ea8c 100644
--- a/java/sca/vtest/wsbinding/wsdlelement/pom.xml
+++ b/java/sca/vtest/wsbinding/wsdlelement/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/java/sca/vtest/wsbinding/wsdlelement/port/pom.xml b/java/sca/vtest/wsbinding/wsdlelement/port/pom.xml
index 777e7cc210..e47ca9c9da 100644
--- a/java/sca/vtest/wsbinding/wsdlelement/port/pom.xml
+++ b/java/sca/vtest/wsbinding/wsdlelement/port/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/java/sca/vtest/wsbinding/wsdlelement/service/pom.xml b/java/sca/vtest/wsbinding/wsdlelement/service/pom.xml
index 149037cf4d..39f2c45921 100644
--- a/java/sca/vtest/wsbinding/wsdlelement/service/pom.xml
+++ b/java/sca/vtest/wsbinding/wsdlelement/service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-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.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>