434 files changed, 1660 insertions, 1660 deletions
diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
index a6e4ac66b9..5670bca8a2 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
index 6e896e93f5..f0da2eefd2 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
index 9c93d600ac..9feff40974 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
index 2e6effbf4d..639e8afc34 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 51c9bb564d..33d5e8c9b4 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -68,7 +68,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- aggregation jars for lib directory -->
@@ -76,19 +76,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-base-runtime-aggregation</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-binding-rmi-runtime-aggregation</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2-aggregation</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
@@ -294,116 +294,116 @@
                                  <feature>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-base-runtime-pom</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </feature>
                              </features>
                              <extensions>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-atom-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-commet-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-corba-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ejb-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-hazelcase-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jms-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rest-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rmi-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rss-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-jaxes-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-python-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-script-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-spring-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-web-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-widget-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-host-jetty</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                              </extensions>
                             <artifactManifests>
diff --git a/sca-java-2.x/trunk/distribution/pom.xml b/sca-java-2.x/trunk/distribution/pom.xml
index 738814f13b..2a64dc0797 100644
--- a/sca-java-2.x/trunk/distribution/pom.xml
+++ b/sca-java-2.x/trunk/distribution/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution</artifactId>
diff --git a/sca-java-2.x/trunk/distribution/samples/pom.xml b/sca-java-2.x/trunk/distribution/samples/pom.xml
index dd5037ff78..9a076a8999 100644
--- a/sca-java-2.x/trunk/distribution/samples/pom.xml
+++ b/sca-java-2.x/trunk/distribution/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/pom.xml
index 8a05b0372e..c78d25371c 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution-tomcat</artifactId>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/download-tomcat/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/download-tomcat/pom.xml
index 68bb686ae3..7d2648325f 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/download-tomcat/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/download-tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
index 3aa5aa3809..6b2bcff2de 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
index 9497949fb5..a1c093b970 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
index 704ee91174..874bbf6f8d 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
index 67de9b020e..4686a83bea 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
index e37b2021cb..6ffd98bc83 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/pom.xml
index 96209a1b57..2a80e2ee47 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>war-legal-checks</artifactId>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
index d77f0e8b3c..c06de0eef4 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/testing/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution-tomcat-testing</artifactId>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
index 592a3848c3..f46ae46d1e 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
index 560703da0c..1ace98e050 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,14 +34,14 @@
         <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-tomcat-hook</artifactId>
-           <version>2.0-SNAPSHOT</version>
+           <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-node-api</artifactId>
-           <version>2.0-SNAPSHOT</version>
+           <version>2.5-SNAPSHOT</version>
            <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
index 3f37559e87..7cf459d897 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tomcat-servlet</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tomcat-hook</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/features/all/pom.xml b/sca-java-2.x/trunk/features/all/pom.xml
index 139a832d31..af7019ddf0 100644
--- a/sca-java-2.x/trunk/features/all/pom.xml
+++ b/sca-java-2.x/trunk/features/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,75 +42,75 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-web20</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-osgi</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-sdo</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-process</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
 
@@ -119,21 +119,21 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- binding extensions -->
@@ -141,73 +141,73 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- removed as the binding is broken presently dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-comet-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency -->
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <!-- for now til the base contents is sorted -->
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- implementation extensions -->
@@ -215,66 +215,66 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-python-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- policy extensions -->
@@ -282,13 +282,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency -->
 
         <!-- databinding extensions -->
@@ -296,13 +296,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- host extensions -->
@@ -310,25 +310,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jee</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- registry extensions -->
@@ -336,13 +336,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- utilities -->
@@ -350,37 +350,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-shell</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <!-- test dependency of tuscany-tracing-aspectj but previously included in the distro? -->
         <dependency>
diff --git a/sca-java-2.x/trunk/features/api/pom.xml b/sca-java-2.x/trunk/features/api/pom.xml
index 465829ca75..b814e4fb39 100644
--- a/sca-java-2.x/trunk/features/api/pom.xml
+++ b/sca-java-2.x/trunk/features/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,21 +36,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Data Collection API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/core/pom.xml b/sca-java-2.x/trunk/features/core/pom.xml
index 79285e4805..4c4eb79d59 100644
--- a/sca-java-2.x/trunk/features/core/pom.xml
+++ b/sca-java-2.x/trunk/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- SCA API -->
@@ -43,13 +43,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
 
@@ -57,150 +57,150 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency-->
 
         <!-- Contribution model -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Data API -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency-->
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!--  Hosts -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency-->
         <!-- host-http is required by tuscany-implementation-node-runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Interface models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>war</type>
         </dependency>
         -->
@@ -209,32 +209,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency-->
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-shell</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/eclipse-pde/pom.xml b/sca-java-2.x/trunk/features/eclipse-pde/pom.xml
index 6c10621348..df6adaa7fc 100644
--- a/sca-java-2.x/trunk/features/eclipse-pde/pom.xml
+++ b/sca-java-2.x/trunk/features/eclipse-pde/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/features/ejava/pom.xml b/sca-java-2.x/trunk/features/ejava/pom.xml
index 2f542f6b6d..365741e30a 100644
--- a/sca-java-2.x/trunk/features/ejava/pom.xml
+++ b/sca-java-2.x/trunk/features/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,55 +37,55 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jee</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 
@@ -94,26 +94,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
 
@@ -121,19 +121,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -145,33 +145,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Policies -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Hazelcast registry -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/osgi/pom.xml b/sca-java-2.x/trunk/features/osgi/pom.xml
index 429b8c626d..2274c47217 100644
--- a/sca-java-2.x/trunk/features/osgi/pom.xml
+++ b/sca-java-2.x/trunk/features/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,14 +37,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <!-- WebService -->
@@ -52,14 +52,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementations -->
@@ -68,19 +68,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Policies -->
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/pom.xml b/sca-java-2.x/trunk/features/pom.xml
index 52dd7ab936..a8e06bbb18 100644
--- a/sca-java-2.x/trunk/features/pom.xml
+++ b/sca-java-2.x/trunk/features/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-feature</artifactId>
diff --git a/sca-java-2.x/trunk/features/process/pom.xml b/sca-java-2.x/trunk/features/process/pom.xml
index 644f55de85..7316f13506 100644
--- a/sca-java-2.x/trunk/features/process/pom.xml
+++ b/sca-java-2.x/trunk/features/process/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,19 +37,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- ODE BPEL -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/sdo/pom.xml b/sca-java-2.x/trunk/features/sdo/pom.xml
index 843608e508..33a11d1c63 100644
--- a/sca-java-2.x/trunk/features/sdo/pom.xml
+++ b/sca-java-2.x/trunk/features/sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,7 +37,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/features/web20/pom.xml b/sca-java-2.x/trunk/features/web20/pom.xml
index 89f0f9679d..34d5566799 100644
--- a/sca-java-2.x/trunk/features/web20/pom.xml
+++ b/sca-java-2.x/trunk/features/web20/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,87 +35,87 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <!-- Core distribution -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Common -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Interface models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxrs</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>		
 
         <!-- Implementation Types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 		        
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Dojo and Dojo Extensions -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>                
 
         <!--Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/features/webapp/pom.xml b/sca-java-2.x/trunk/features/webapp/pom.xml
index bc87efd412..4e8721c68c 100644
--- a/sca-java-2.x/trunk/features/webapp/pom.xml
+++ b/sca-java-2.x/trunk/features/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Explicitly list the servlet/jsp apis as "provided" dependencies are not transitive -->
@@ -67,26 +67,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 	  <!-- JSONP Binding material -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 	  <!-- end of JSONP Binding -->
 
diff --git a/sca-java-2.x/trunk/features/webservice/pom.xml b/sca-java-2.x/trunk/features/webservice/pom.xml
index 0a169ac8a2..f1200642c3 100644
--- a/sca-java-2.x/trunk/features/webservice/pom.xml
+++ b/sca-java-2.x/trunk/features/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,19 +37,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -80,26 +80,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml b/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
index 09cfbdf82e..a38c2a2533 100644
--- a/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
index 2ed94936a9..906cb9594b 100644
--- a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,14 +36,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>   
                 
@@ -57,28 +57,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>    
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
index f5801393b7..1797ab27a2 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.apache.tuscany.sca</groupId>
       <artifactId>tuscany-sca</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath>../../../pom.xml</relativePath>
    </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index d4f99d3ebb..7884875cd2 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,7 @@
    <name>${artifactId}</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
index f1bbe79e2f..2fb35274e8 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
index de7c848d75..8807b83269 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index 76183eafc7..86a1d3983c 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
@@ -147,7 +147,7 @@
         </plugins>
     </build>
     <properties>
-        <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+        <tuscany.version>2.5-SNAPSHOT</tuscany.version>
     </properties>
     #end
 </project>
diff --git a/sca-java-2.x/trunk/maven/archetypes/implementation/pom.xml b/sca-java-2.x/trunk/maven/archetypes/implementation/pom.xml
index 3ccb40a2fa..b23195a17d 100644
--- a/sca-java-2.x/trunk/maven/archetypes/implementation/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/implementation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml
index 4e5a43491c..76bd0d78fd 100644
--- a/sca-java-2.x/trunk/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/implementation/src/main/resources/archetype-resources/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,14 +36,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/policy/pom.xml b/sca-java-2.x/trunk/maven/archetypes/policy/pom.xml
index 4fc6d796b1..19b866a621 100644
--- a/sca-java-2.x/trunk/maven/archetypes/policy/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml
index 1a60a6b70f..73c0fb7941 100644
--- a/sca-java-2.x/trunk/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/policy/src/main/resources/archetype-resources/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>${groupId}</groupId>
@@ -36,7 +36,7 @@
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
             <scope>provided</scope>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/maven/archetypes/pom.xml b/sca-java-2.x/trunk/maven/archetypes/pom.xml
index 782bd7b999..ed537040d8 100644
--- a/sca-java-2.x/trunk/maven/archetypes/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-archetype</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
index 907bd8e6bd..cbccc3ab63 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index ecc47712a9..265d1d6bb9 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
@@ -175,7 +175,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.5-SNAPSHOT</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
 	#end
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
index 537acbb350..514c7b1d29 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index 19c1181f1b..61f37ecf4c 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
@@ -145,7 +145,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.5-SNAPSHOT</tuscany.version>
 		<myfaces.version>1.5</myfaces.version>
 		<jetty.version>6.1.4</jetty.version>
  	</properties>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/pom.xml
index e2e101aae0..0e555c656e 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index 95c2f5800d..cb33df3490 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
@@ -148,7 +148,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.5-SNAPSHOT</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
 </project>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
index 6c9aa7a622..3d9be447ce 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index 8e8bbe128f..40d886dd8c 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
@@ -115,7 +115,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.5-SNAPSHOT</tuscany.version>
 		<stripes.version>1.5.2</stripes.version>
 		<jetty.version>6.1.4</jetty.version>
 	</properties>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
index 58ca2076b5..d6608866d7 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 9e885e0baf..31a3375056 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -133,7 +133,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.5-SNAPSHOT</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
 </project>
diff --git a/sca-java-2.x/trunk/maven/tuscany-diagram-plugin/pom.xml b/sca-java-2.x/trunk/maven/tuscany-diagram-plugin/pom.xml
index de536855c5..d3e0cf4366 100644
--- a/sca-java-2.x/trunk/maven/tuscany-diagram-plugin/pom.xml
+++ b/sca-java-2.x/trunk/maven/tuscany-diagram-plugin/pom.xml
@@ -23,13 +23,13 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuscany-diagram-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Apache Tuscany Maven SCA Composite Diagram Plugin</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
        <dependency>
@@ -50,7 +50,7 @@
        <dependency>
           <groupId>org.apache.tuscany.sca</groupId>
           <artifactId>tuscany-composite-diagram</artifactId>
-          <version>2.0-SNAPSHOT</version>
+          <version>2.5-SNAPSHOT</version>
        </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
index 2950b0adca..71b19fa928 100644
--- a/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
+++ b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
@@ -23,13 +23,13 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuscany-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Apache Tuscany Maven Tuscany Plugin</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
        <dependency>
@@ -50,12 +50,12 @@
        <dependency>
           <groupId>org.apache.tuscany.sca</groupId>
           <artifactId>tuscany-base-runtime</artifactId>
-          <version>2.0-SNAPSHOT</version>
+          <version>2.5-SNAPSHOT</version>
        </dependency>
        <dependency>
           <groupId>org.apache.tuscany.sca</groupId>
           <artifactId>tuscany-domain-hazelcast</artifactId>
-          <version>2.0-SNAPSHOT</version>
+          <version>2.5-SNAPSHOT</version>
        </dependency>
        <dependency>
           <groupId>jline</groupId>
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/pom.xml b/sca-java-2.x/trunk/modules/assembly-xml/pom.xml
index ab5ae2b6db..be026a9d4e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
              
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/pom.xml b/sca-java-2.x/trunk/modules/assembly-xsd/pom.xml
index 8193461b62..e28f4e62bb 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/sca-java-2.x/trunk/modules/assembly/pom.xml b/sca-java-2.x/trunk/modules/assembly/pom.xml
index 11fa07c1e6..08b58aa92e 100644
--- a/sca-java-2.x/trunk/modules/assembly/pom.xml
+++ b/sca-java-2.x/trunk/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml
index acf8ff76b5..50bf751abc 100644
--- a/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml
+++ b/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/base-runtime/pom.xml b/sca-java-2.x/trunk/modules/base-runtime/pom.xml
index 6092233e38..6f7833c5f6 100644
--- a/sca-java-2.x/trunk/modules/base-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/base-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
index bcafd189ed..31476104b5 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,61 +33,61 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -214,21 +214,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-atom/pom.xml b/sca-java-2.x/trunk/modules/binding-atom/pom.xml
index 84da39eca5..169ba81e81 100644
--- a/sca-java-2.x/trunk/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-atom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
 			<scope>test</scope>			
         </dependency>
 				
diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml
index ce39d8428e..db2fe9205f 100644
--- a/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-comet/pom.xml b/sca-java-2.x/trunk/modules/binding-comet/pom.xml
index 0bdd6f4406..3e018ca01a 100644
--- a/sca-java-2.x/trunk/modules/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-comet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-corba-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-corba-runtime/pom.xml
index 516eea5f99..a14e89fe89 100644
--- a/sca-java-2.x/trunk/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-corba-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
     
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 	
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/sca-java-2.x/trunk/modules/binding-corba/pom.xml b/sca-java-2.x/trunk/modules/binding-corba/pom.xml
index fd6a3d12ff..e444d737c7 100644
--- a/sca-java-2.x/trunk/modules/binding-corba/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 	<dependency>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-host-corba</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 	</dependency>
 	
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/binding-ejb-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-ejb-runtime/pom.xml
index 1fdfefc30e..ecf186c25c 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ejb-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -72,14 +72,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-ejb/pom.xml b/sca-java-2.x/trunk/modules/binding-ejb/pom.xml
index 79ce7affb8..4fd3b6562b 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-http-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-http-runtime/pom.xml
index 9aeb6ce382..e8a1ff3e68 100644
--- a/sca-java-2.x/trunk/modules/binding-http-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-http-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -70,28 +70,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-http/pom.xml b/sca-java-2.x/trunk/modules/binding-http/pom.xml
index 204dd1cf41..35b5ce1b1f 100644
--- a/sca-java-2.x/trunk/modules/binding-http/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime-activemq/pom.xml b/sca-java-2.x/trunk/modules/binding-jms-runtime-activemq/pom.xml
index 32262c82da..849e5195ab 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime-activemq/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime-activemq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms-runtime-activemq</artifactId>
@@ -33,14 +33,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
index 0a9d2c104f..b006c5231c 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms-runtime</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-jms/pom.xml b/sca-java-2.x/trunk/modules/binding-jms/pom.xml
index 4d05f777a3..47a38f41c6 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
index 382a273968..31398c2c1e 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp-runtime</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency-->   
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
@@ -70,28 +70,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>    
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml
index 3f5ff6aaf0..884d286a54 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
index 42b39e3a72..fd042f5b11 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,49 +33,49 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -140,14 +140,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc/pom.xml
index 8df899f83a..73fe28aa29 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-local-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-local-runtime/pom.xml
index b9c0b85ca7..fea240a308 100644
--- a/sca-java-2.x/trunk/modules/binding-local-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-local-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>       
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
                
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
index 6f4b2e313b..1f2528e12c 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,74 +33,74 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxrs</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -211,21 +211,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-rest/pom.xml b/sca-java-2.x/trunk/modules/binding-rest/pom.xml
index 791dce4fa5..9cf5fd0788 100644
--- a/sca-java-2.x/trunk/modules/binding-rest/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml
index c0f589a3d5..bbe9e4e523 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi-runtime</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -41,19 +41,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-rmi/pom.xml b/sca-java-2.x/trunk/modules/binding-rmi/pom.xml
index b51968af9e..d17f8ef847 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml
index 67d204c98e..4fc1472cee 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,44 +35,44 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime2/pom.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime2/pom.xml
index ca272b2b3f..b7f7668c42 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime2/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,37 +35,37 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/binding-websocket/pom.xml b/sca-java-2.x/trunk/modules/binding-websocket/pom.xml
index 62d5b79db5..c236ee279b 100644
--- a/sca-java-2.x/trunk/modules/binding-websocket/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-websocket/pom.xml
@@ -22,13 +22,13 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.apache.tuscany.sca</groupId>
 	<artifactId>tuscany-binding-websocket</artifactId>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Websocket Binding Extension</name>
 
 	<dependencies>
@@ -37,7 +37,7 @@
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
 			<type>pom</type>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
index 4b1bdb69ff..e27e58ffd6 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>     
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope> <!-- it's in base -->
         </dependency>      
 
@@ -385,21 +385,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-wspolicy</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>         
 
         <!--  Runtime dependencies -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -407,7 +407,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency> 
@@ -415,7 +415,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>     
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml
index e0cbfc4d1e..8c1e5a80fb 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,73 +33,73 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
 
@@ -108,21 +108,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
index 3d473814b0..55bad80c44 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,66 +33,66 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!--  Test dependencies -->
@@ -100,14 +100,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/pom.xml
index 5d56109cde..41e8e8f028 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws/pom.xml b/sca-java-2.x/trunk/modules/binding-ws/pom.xml
index 4c841fe7f8..64c2993430 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/sca-java-2.x/trunk/modules/builder/pom.xml b/sca-java-2.x/trunk/modules/builder/pom.xml
index 13e7ecc8a5..82e6616b2d 100644
--- a/sca-java-2.x/trunk/modules/builder/pom.xml
+++ b/sca-java-2.x/trunk/modules/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-builder</artifactId>
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                        
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/common-http/pom.xml b/sca-java-2.x/trunk/modules/common-http/pom.xml
index ede1892d4e..0204f67e92 100644
--- a/sca-java-2.x/trunk/modules/common-http/pom.xml
+++ b/sca-java-2.x/trunk/modules/common-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-http</artifactId>
@@ -32,7 +32,7 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/common-java/pom.xml b/sca-java-2.x/trunk/modules/common-java/pom.xml
index 655b3cf793..5096fa5236 100644
--- a/sca-java-2.x/trunk/modules/common-java/pom.xml
+++ b/sca-java-2.x/trunk/modules/common-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-java</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/common-xml/pom.xml b/sca-java-2.x/trunk/modules/common-xml/pom.xml
index eb967a6ab4..54c8d1438a 100644
--- a/sca-java-2.x/trunk/modules/common-xml/pom.xml
+++ b/sca-java-2.x/trunk/modules/common-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/composite-diagram/pom.xml b/sca-java-2.x/trunk/modules/composite-diagram/pom.xml
index cad97b552a..29ee923e59 100644
--- a/sca-java-2.x/trunk/modules/composite-diagram/pom.xml
+++ b/sca-java-2.x/trunk/modules/composite-diagram/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-composite-diagram</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <name>Apache Tuscany SCA Composite Diagram Generator Application</name>
 
     <dependencies>
@@ -76,45 +76,45 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
index b4e26dc316..90c49cbbc8 100644
--- a/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-osgi</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/contribution-resource/pom.xml b/sca-java-2.x/trunk/modules/contribution-resource/pom.xml
index 2df499917f..a60dbd9f0c 100644
--- a/sca-java-2.x/trunk/modules/contribution-resource/pom.xml
+++ b/sca-java-2.x/trunk/modules/contribution-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/contribution/pom.xml b/sca-java-2.x/trunk/modules/contribution/pom.xml
index 56d8f1af3a..361d9b5037 100644
--- a/sca-java-2.x/trunk/modules/contribution/pom.xml
+++ b/sca-java-2.x/trunk/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/core-databinding/pom.xml b/sca-java-2.x/trunk/modules/core-databinding/pom.xml
index a1f2235b13..b23924cb96 100644
--- a/sca-java-2.x/trunk/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/trunk/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sca-java-2.x/trunk/modules/core-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/core-runtime-pom/pom.xml
index d7f70a9396..e2b0573a8e 100644
--- a/sca-java-2.x/trunk/modules/core-runtime-pom/pom.xml
+++ b/sca-java-2.x/trunk/modules/core-runtime-pom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/core-spi/pom.xml b/sca-java-2.x/trunk/modules/core-spi/pom.xml
index a1e48972e2..25915ec4a6 100644
--- a/sca-java-2.x/trunk/modules/core-spi/pom.xml
+++ b/sca-java-2.x/trunk/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,25 +32,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>                        
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/core/pom.xml b/sca-java-2.x/trunk/modules/core/pom.xml
index 8354a8e925..be2cc1298d 100644
--- a/sca-java-2.x/trunk/modules/core/pom.xml
+++ b/sca-java-2.x/trunk/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core</artifactId>
@@ -32,25 +32,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/data-api/pom.xml b/sca-java-2.x/trunk/modules/data-api/pom.xml
index 5da4d2ef0a..2cacb73677 100644
--- a/sca-java-2.x/trunk/modules/data-api/pom.xml
+++ b/sca-java-2.x/trunk/modules/data-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml
index 8a1e41fa7c..7cf8857ac9 100644
--- a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>  
diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
index 8d1d31bcce..e92ffe4eb1 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>  
diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
index 855356d341..fbd2753dfa 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml
index 233e674432..1ab0f6723c 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-json</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency> 
 
diff --git a/sca-java-2.x/trunk/modules/databinding-sdo-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-sdo-axiom/pom.xml
index c142b24500..c18beacb51 100644
--- a/sca-java-2.x/trunk/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-sdo-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
index 222baf5c8e..9420f1e747 100644
--- a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <!-- FIXME: We might want to create a separate module to host the processor -->
    
diff --git a/sca-java-2.x/trunk/modules/databinding/pom.xml b/sca-java-2.x/trunk/modules/databinding/pom.xml
index dcbd4c103d..d2f8be6f8e 100644
--- a/sca-java-2.x/trunk/modules/databinding/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-databinding</artifactId>
@@ -32,37 +32,37 @@
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>		
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
 
 <!--         
diff --git a/sca-java-2.x/trunk/modules/deployment/pom.xml b/sca-java-2.x/trunk/modules/deployment/pom.xml
index ad30c69d1a..3cefa73072 100644
--- a/sca-java-2.x/trunk/modules/deployment/pom.xml
+++ b/sca-java-2.x/trunk/modules/deployment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,43 +35,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml b/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml
index 796a4cb391..275b5238f4 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-domain-hazelcast</artifactId>
@@ -42,31 +42,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/domain-node/pom.xml b/sca-java-2.x/trunk/modules/domain-node/pom.xml
index 56092a1f9d..13a5d0b570 100644
--- a/sca-java-2.x/trunk/modules/domain-node/pom.xml
+++ b/sca-java-2.x/trunk/modules/domain-node/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,39 +35,39 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>          
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
                       
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>          
                
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
index 04dca98062..40b5092dab 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
@@ -56,7 +56,7 @@ public class Node2TestCase {
     @Test
     public void remoteInstall() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
         Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase");
-        node.installContribution("http://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar");
+        node.installContribution("http://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.5-SNAPSHOT/helloworld-2.5-SNAPSHOT.jar");
 
         Assert.assertEquals(1, node.getInstalledContributionURIs().size());
         Assert.assertEquals("helloworld", node.getInstalledContributionURIs().get(0));
@@ -70,7 +70,7 @@ public class Node2TestCase {
         TuscanyRuntime runtime = TuscanyRuntime.newInstance();
         try {
         Node nodeA = runtime.createNode("uri:DistributedInstall");
-        nodeA.installContribution("http://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar");
+        nodeA.installContribution("http://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.5-SNAPSHOT/helloworld-2.5-SNAPSHOT.jar");
         nodeA.installContribution("src/test/resources/export.jar");
 
         Assert.assertEquals(2, nodeA.getInstalledContributionURIs().size());
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml b/sca-java-2.x/trunk/modules/domain-node/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
index e480d4f534..6d11bd23d3 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.5-SNAPSHOT</version>
          </plugin>
        </plugins>
     </build>
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/pom.xml b/sca-java-2.x/trunk/modules/endpoint-tribes/pom.xml
index 973363ae84..c2b59c847e 100644
--- a/sca-java-2.x/trunk/modules/endpoint-tribes/pom.xml
+++ b/sca-java-2.x/trunk/modules/endpoint-tribes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-endpoint-tribes</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml b/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
index 20c3d72088..37839f3b47 100644
--- a/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility-equinox</artifactId>
@@ -32,7 +32,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/extensibility/pom.xml b/sca-java-2.x/trunk/modules/extensibility/pom.xml
index 23a4b6a971..4fee31e8c9 100644
--- a/sca-java-2.x/trunk/modules/extensibility/pom.xml
+++ b/sca-java-2.x/trunk/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/sca-java-2.x/trunk/modules/host-corba-jee/pom.xml b/sca-java-2.x/trunk/modules/host-corba-jee/pom.xml
index 29cd6209ae..fb6a415894 100644
--- a/sca-java-2.x/trunk/modules/host-corba-jee/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-corba-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/host-corba-jse-tns/pom.xml b/sca-java-2.x/trunk/modules/host-corba-jse-tns/pom.xml
index 5014507384..e8ecebe0d8 100644
--- a/sca-java-2.x/trunk/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-corba-jse-tns/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <artifactId>tuscany-host-corba-jse-tns</artifactId>
     <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/host-corba-jse/pom.xml b/sca-java-2.x/trunk/modules/host-corba-jse/pom.xml
index 72cb65f5b4..78171b7b0f 100644
--- a/sca-java-2.x/trunk/modules/host-corba-jse/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-corba-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/host-corba/pom.xml b/sca-java-2.x/trunk/modules/host-corba/pom.xml
index b1e1281e17..203306c178 100644
--- a/sca-java-2.x/trunk/modules/host-corba/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml b/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml
index a384ff6c9a..0b4b045712 100644
--- a/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-http-osgi</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
@@ -60,13 +60,13 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/host-http/pom.xml b/sca-java-2.x/trunk/modules/host-http/pom.xml
index 28c5dc6e70..2c1460aaa2 100644
--- a/sca-java-2.x/trunk/modules/host-http/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/host-jetty/pom.xml b/sca-java-2.x/trunk/modules/host-jetty/pom.xml
index 6743eb92b2..ed2cc291cc 100644
--- a/sca-java-2.x/trunk/modules/host-jetty/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/host-rmi/pom.xml b/sca-java-2.x/trunk/modules/host-rmi/pom.xml
index 018ee3cd3b..f59b8127d1 100644
--- a/sca-java-2.x/trunk/modules/host-rmi/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/modules/host-webapp/pom.xml b/sca-java-2.x/trunk/modules/host-webapp/pom.xml
index 95a052e299..953f8c1077 100644
--- a/sca-java-2.x/trunk/modules/host-webapp/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
index 6ad45efc9f..5bb0ae6fd1 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-bpel-runtime</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency> 
         <!-- ODE Jars -->
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel/pom.xml
index d6d2afe92c..726591cd6b 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-implementation-bpel</artifactId>
@@ -32,25 +32,25 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-java-runtime/pom.xml
index e6c5af42ff..95ef3a37c9 100644
--- a/sca-java-2.x/trunk/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-java/pom.xml b/sca-java-2.x/trunk/modules/implementation-java/pom.xml
index 9795bd677e..9b82212b07 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java</artifactId>
@@ -32,55 +32,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
index c95842caf9..deba42344b 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,33 +34,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -121,14 +121,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml
index 44fb9f8a7b..41d90fe6a5 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,43 +34,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/pom.xml
index c80a97226f..65dd96ce46 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,13 +37,13 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -57,13 +57,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml b/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
index 75f5e949bd..88a1bc92ce 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -45,7 +45,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/implementation-python-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-python-runtime/pom.xml
index 677e254677..1423cc534f 100644
--- a/sca-java-2.x/trunk/modules/implementation-python-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-python-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-python</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,28 +60,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/implementation-python/pom.xml b/sca-java-2.x/trunk/modules/implementation-python/pom.xml
index f74ae9dddb..90e8f911af 100644
--- a/sca-java-2.x/trunk/modules/implementation-python/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-python/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
index 7e039ff372..6ad7c26f6a 100644
--- a/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
@@ -142,14 +142,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-script/pom.xml b/sca-java-2.x/trunk/modules/implementation-script/pom.xml
index f6b295814e..dbb1f1ec21 100644
--- a/sca-java-2.x/trunk/modules/implementation-script/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-script/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml
index a40a0ff393..ad65c592ca 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-runtime</artifactId>
@@ -34,7 +34,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency> 
 
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-stub/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-stub/pom.xml
index 5745399cf1..b85c0c007b 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-stub/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-stub</artifactId>
@@ -43,13 +43,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                   
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-tie/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-tie/pom.xml
index e8462997a4..be989efee6 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-tie/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-tie/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-tie</artifactId>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
index 0d593caa67..de2e9032e1 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-webapp</artifactId>
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Spring dependencies... -->
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring/pom.xml
index 371bde71b9..4466227790 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                   
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/implementation-web-client/pom.xml b/sca-java-2.x/trunk/modules/implementation-web-client/pom.xml
index 15b1a1b76b..093598498b 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-client/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-web-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-web-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-web-runtime/pom.xml
index 19594740f3..b51c46bcbe 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-web-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- provided scope doesn't pull in transitive dependencies -->
diff --git a/sca-java-2.x/trunk/modules/implementation-web/pom.xml b/sca-java-2.x/trunk/modules/implementation-web/pom.xml
index cb8a4602b5..b4e3361202 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,31 +34,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/pom.xml b/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/pom.xml
index 19b8803158..a0100bcb05 100644
--- a/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-widget-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-web-javascript-dojo</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>		
 
 		<dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-widget-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-widget-runtime/pom.xml
index f9b0f1615c..43607342c6 100644
--- a/sca-java-2.x/trunk/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-widget-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>           
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
        <dependency>
@@ -76,21 +76,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/implementation-widget/pom.xml b/sca-java-2.x/trunk/modules/implementation-widget/pom.xml
index 2f2c209c02..f3ea7f2e2e 100644
--- a/sca-java-2.x/trunk/modules/implementation-widget/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-widget/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
index a04547f4e5..c1df3dd979 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-jaxrs</artifactId>
@@ -40,7 +40,7 @@
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
             <scope>provided</scope>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
index 1e2833765b..d84213d40b 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/interface-java/pom.xml b/sca-java-2.x/trunk/modules/interface-java/pom.xml
index 22f9234cd3..f36323638e 100644
--- a/sca-java-2.x/trunk/modules/interface-java/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>              
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
index 5d025cd4bc..d696f10f61 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
               
 
diff --git a/sca-java-2.x/trunk/modules/launcher/pom.xml b/sca-java-2.x/trunk/modules/launcher/pom.xml
index 9dec07661d..59b1cb43a8 100644
--- a/sca-java-2.x/trunk/modules/launcher/pom.xml
+++ b/sca-java-2.x/trunk/modules/launcher/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/monitor/pom.xml b/sca-java-2.x/trunk/modules/monitor/pom.xml
index e7e9ca9c15..c6dc7a4c32 100644
--- a/sca-java-2.x/trunk/modules/monitor/pom.xml
+++ b/sca-java-2.x/trunk/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/myfaces/pom.xml b/sca-java-2.x/trunk/modules/myfaces/pom.xml
index 9e6f742ce3..295dfb30d2 100644
--- a/sca-java-2.x/trunk/modules/myfaces/pom.xml
+++ b/sca-java-2.x/trunk/modules/myfaces/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/node-api/pom.xml b/sca-java-2.x/trunk/modules/node-api/pom.xml
index 2701dc6695..705674f4a4 100644
--- a/sca-java-2.x/trunk/modules/node-api/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
index 78002f79a5..74541f7592 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -73,13 +73,13 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,33 +88,33 @@
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
             <scope>provided</scope>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
             <scope>provided</scope>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 -->
diff --git a/sca-java-2.x/trunk/modules/node-impl/pom.xml b/sca-java-2.x/trunk/modules/node-impl/pom.xml
index 5d55b13fc8..c2987c7bf2 100644
--- a/sca-java-2.x/trunk/modules/node-impl/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,78 +35,78 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>          
               
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
index f6121829e3..76d44b92c1 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -48,7 +48,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/node-launcher/pom.xml b/sca-java-2.x/trunk/modules/node-launcher/pom.xml
index 4ae3dac803..78c06624ca 100644
--- a/sca-java-2.x/trunk/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/node-manager/pom.xml b/sca-java-2.x/trunk/modules/node-manager/pom.xml
index 61e15fc824..39554f6478 100644
--- a/sca-java-2.x/trunk/modules/node-manager/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-manager/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,97 +34,97 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -149,14 +149,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
index 5aba4b461d..1d490bde42 100644
--- a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
+++ b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/modules/policy-logging/pom.xml b/sca-java-2.x/trunk/modules/policy-logging/pom.xml
index 9f6b343671..5c257b068a 100644
--- a/sca-java-2.x/trunk/modules/policy-logging/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-logging/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-logging</artifactId>
@@ -35,7 +35,7 @@
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
             <scope>provided</scope>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/policy-security-jsr250/pom.xml b/sca-java-2.x/trunk/modules/policy-security-jsr250/pom.xml
index c173e523a8..8b6aa1f45f 100644
--- a/sca-java-2.x/trunk/modules/policy-security-jsr250/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-security-jsr250/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security-jsr250</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -41,13 +41,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/policy-security/pom.xml b/sca-java-2.x/trunk/modules/policy-security/pom.xml
index a5322bc87a..171c718182 100644
--- a/sca-java-2.x/trunk/modules/policy-security/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
index 1c771eb6d7..e6651f0d30 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
index 035621631e..c28011670c 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction-runtime</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/policy-transaction/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction/pom.xml
index bba0742181..424f6ef2fc 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml
index 3f2630330c..6d6d2fb6ad 100644
--- a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-wspolicy</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml
index ad664d82d3..6999e494cd 100644
--- a/sca-java-2.x/trunk/modules/pom.xml
+++ b/sca-java-2.x/trunk/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/sca-java-2.x/trunk/modules/sca-api/pom.xml b/sca-java-2.x/trunk/modules/sca-api/pom.xml
index edc55b17aa..64d69e18ae 100644
--- a/sca-java-2.x/trunk/modules/sca-api/pom.xml
+++ b/sca-java-2.x/trunk/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/pom.xml b/sca-java-2.x/trunk/modules/sca-client-impl/pom.xml
index 0acdbb3107..983e934ffc 100644
--- a/sca-java-2.x/trunk/modules/sca-client-impl/pom.xml
+++ b/sca-java-2.x/trunk/modules/sca-client-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,17 +34,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/modules/shell/pom.xml b/sca-java-2.x/trunk/modules/shell/pom.xml
index d2466e3475..3e9d73bccf 100644
--- a/sca-java-2.x/trunk/modules/shell/pom.xml
+++ b/sca-java-2.x/trunk/modules/shell/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/stripes/pom.xml b/sca-java-2.x/trunk/modules/stripes/pom.xml
index 7aad356bc4..2c55f414af 100644
--- a/sca-java-2.x/trunk/modules/stripes/pom.xml
+++ b/sca-java-2.x/trunk/modules/stripes/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml b/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
index 0a64e869ec..a31e7a8cb6 100644
--- a/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
+++ b/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tracing-aspectj</artifactId>
diff --git a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
index 744c4f27dd..63bb26f1f9 100644
--- a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
+++ b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
diff --git a/sca-java-2.x/trunk/modules/web-javascript/pom.xml b/sca-java-2.x/trunk/modules/web-javascript/pom.xml
index 2247174726..3a114173b5 100644
--- a/sca-java-2.x/trunk/modules/web-javascript/pom.xml
+++ b/sca-java-2.x/trunk/modules/web-javascript/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/wink/pom.xml b/sca-java-2.x/trunk/modules/wink/pom.xml
index 2ad4a8a120..5d9b2594a1 100644
--- a/sca-java-2.x/trunk/modules/wink/pom.xml
+++ b/sca-java-2.x/trunk/modules/wink/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/xsd/pom.xml b/sca-java-2.x/trunk/modules/xsd/pom.xml
index 767bab3327..95aea2ed61 100644
--- a/sca-java-2.x/trunk/modules/xsd/pom.xml
+++ b/sca-java-2.x/trunk/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 9a55870597..2d4860464b 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -33,7 +33,7 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (2.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk</connection>
@@ -342,7 +342,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-dependency-lister</artifactId>
-                        <version>2.0-SNAPSHOT</version>
+                        <version>2.5-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
diff --git a/sca-java-2.x/trunk/samples/applications/pom.xml b/sca-java-2.x/trunk/samples/applications/pom.xml
index 80029730d0..f01b1a9242 100644
--- a/sca-java-2.x/trunk/samples/applications/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>tuscany-samples-applications</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Sample Applications</name>
 
diff --git a/sca-java-2.x/trunk/samples/applications/store/pom.xml b/sca-java-2.x/trunk/samples/applications/store/pom.xml
index 7896c1c4ed..1c08c54261 100644
--- a/sca-java-2.x/trunk/samples/applications/store/pom.xml
+++ b/sca-java-2.x/trunk/samples/applications/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store</artifactId>
@@ -32,48 +32,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
index 2f4ff52282..cecf4660a6 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
@@ -24,11 +24,11 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
    <artifactId>helloworld-jaxrs</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld JAX-RS</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonp/pom.xml
index 90fdd582dd..236bfce88c 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonp/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonp/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
 
    <artifactId>helloworld-jsonp</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld JSONP</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
index 9cdbd06477..5b57b20ce0 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
 
    <artifactId>helloworld-jsonrpc</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld JSON-RPC</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
index 303eb9efd0..3ef174165a 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
 
    <artifactId>helloworld-scaclient</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld SCAClient</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
index 6ea93f7ce5..fe43f5c339 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
@@ -24,11 +24,11 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
    <artifactId>helloworld-spring</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld Spring</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
index 48c5ddb38d..ac09fe305e 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
 
    <artifactId>helloworld-webapp</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld WebApp</name>
    <packaging>war</packaging>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
index 9aa49ad3ba..1526b91b5a 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
 
    <artifactId>helloworld-webservice</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld Web Service</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml
index 2af170d609..334f6ac7e5 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml
@@ -22,6 +22,6 @@
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
     domain="uri:default">
 
-    <contribution location="target/helloworld-withdeps-2.0-SNAPSHOT.zip" startDeployables="true" />
+    <contribution location="target/helloworld-withdeps-2.5-SNAPSHOT.zip" startDeployables="true" />
 
 </node>
 \ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
index d347535dc3..4a444de6e9 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
@@ -24,11 +24,11 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
    <artifactId>helloworld-withdeps</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld With Dependencies</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java
index 6770d288fd..23d960b29f 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java
@@ -28,7 +28,7 @@ public class HelloworldTestCase {
     public void testSayHello() throws NoSuchServiceException {
 
 //        // Run the SCA composite in a Tuscany runtime
-//        Node node = TuscanyRuntime.runComposite(null, "target/helloworld-withdeps-2.0-SNAPSHOT.zip");
+//        Node node = TuscanyRuntime.runComposite(null, "target/helloworld-withdeps-2.5-SNAPSHOT.zip");
 //        try {
 //            
 //            // Get the Helloworld service proxy
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
index 8098e1d4fd..6ff4991f61 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
@@ -24,11 +24,11 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
    <artifactId>helloworld</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld</name>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/pom.xml b/sca-java-2.x/trunk/samples/getting-started/pom.xml
index 444f00ff4c..6d00cd566d 100644
--- a/sca-java-2.x/trunk/samples/getting-started/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuscany-samples-getting-started</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Samples Getting Started</name>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/async-invocation/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async-invocation/pom.xml
index ae33a3ac22..c09962ca56 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async-invocation/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async-invocation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <artifactId>sample-async-invocation</artifactId>
@@ -46,14 +46,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
        
@@ -71,7 +71,7 @@
          <plugin>
              <groupId>org.apache.tuscany.sca</groupId>
              <artifactId>tuscany-maven-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.5-SNAPSHOT</version>
          </plugin>
        </plugins>
     </build>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
index 98c839b468..1dc499567b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
@@ -22,20 +22,20 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-comet</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-comet-autocomplete-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.comet Real-Time Suggestions Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-comet-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
@@ -70,7 +70,7 @@
                 		<webappArtifact>
                         	<groupId>org.apache.tuscany.sca.samples</groupId>
                         	<artifactId>sample-binding-comet-autocomplete-webapp</artifactId>
-                        	<version>2.0-SNAPSHOT</version>
+                        	<version>2.5-SNAPSHOT</version>
                 		</webappArtifact>
 			        </webapps>
 				</configuration>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
index 8bad975af7..8aeef9c28e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
@@ -22,20 +22,20 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-comet</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-comet-chat-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.comet Chat Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-comet-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
@@ -70,7 +70,7 @@
                 		<webappArtifact>
                         	<groupId>org.apache.tuscany.sca.samples</groupId>
                         	<artifactId>sample-binding-comet-chat-webapp</artifactId>
-                        	<version>2.0-SNAPSHOT</version>
+                        	<version>2.5-SNAPSHOT</version>
                 		</webappArtifact>
 			        </webapps>
 				</configuration>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
index c4436f41d9..f78c063cd7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-learning-more</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
index 9e49d3ca88..02b238baeb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
@@ -22,20 +22,20 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-comet</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-comet-pubsub-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.comet PubSub Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-comet-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
@@ -70,7 +70,7 @@
                 		<webappArtifact>
                         	<groupId>org.apache.tuscany.sca.samples</groupId>
                         	<artifactId>sample-binding-comet-pubsub-webapp</artifactId>
-                        	<version>2.0-SNAPSHOT</version>
+                        	<version>2.5-SNAPSHOT</version>
                 		</webappArtifact>
 			        </webapps>
 				</configuration>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
index 58674ea6c9..78d05e8e65 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -22,20 +22,20 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-comet</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-comet-weather-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.comet Weather Monitor Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-comet-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
@@ -63,7 +63,7 @@
                 		<webappArtifact>
                         	<groupId>org.apache.tuscany.sca.samples</groupId>
                         	<artifactId>sample-binding-comet-weather-webapp</artifactId>
-                        	<version>2.0-SNAPSHOT</version>
+                        	<version>2.5-SNAPSHOT</version>
                 		</webappArtifact>
 			        </webapps>
 				</configuration>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
index 672e9244f5..71e2276408 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
@@ -23,25 +23,25 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-websocket-autocomplete-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.websocket Autocomplete Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
index 1c56719b64..8af71012bf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
@@ -22,25 +22,25 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-websocket-chat-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.websocket Chat Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
index 640cf6fdec..63209f2964 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-learning-more</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
index 13f7bd7958..559547d04e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
@@ -22,25 +22,25 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-websocket-pubsub-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.websocket PubSub Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
index 291b673caf..29abbd978b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
@@ -22,25 +22,25 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca.samples</groupId>
 		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>sample-binding-websocket-weather-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.5-SNAPSHOT</version>
 	<name>Apache Tuscany SCA Sample binding.websocket Weather Monitor Webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml
index ea8da9c0c8..4fa8592757 100644
--- a/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml
@@ -26,11 +26,11 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath />
    </parent>
    <artifactId>sample-contribution-osgi</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Sample Calculator OSGi</name>
 
@@ -58,14 +58,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>               
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
index 89f9ac4202..2c76cde49e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/calculator-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -33,27 +33,27 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>runtime</scope>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
index b73b8ca41e..1bb41e3bb4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/operations-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/pom.xml
index 11289b85e1..213c18848c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-dynamic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-learning-more</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-distributed-osgi-dynamic</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
index d4488cf982..f6305f7a37 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/calculator-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -33,27 +33,27 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
             <scope>runtime</scope>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
index b1790f1b4d..b6155d5071 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/operations-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/pom.xml
index 7e77997f36..bcf92b007a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi-static/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-learning-more</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-distributed-osgi-static</artifactId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index 57226d3862..482612addb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>tuscany-samples-learning-more</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Sample Learning More</name>
 
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml
index bf5814479e..c95a67470d 100644
--- a/sca-java-2.x/trunk/samples/pom.xml
+++ b/sca-java-2.x/trunk/samples/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.tuscany.sca.samples</groupId>
     <artifactId>tuscany-samples</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Samples</name>
 
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/ant/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/ant/build.xml
index d60fbfa831..3a71556fb6 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/ant/build.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/ant/build.xml
@@ -73,7 +73,7 @@
             <classpath>  
                 <pathelement location="target/${jar.name}"/>
                 <fileset dir="${tuscany.home}/lib">
-                   <include name="tuscany-base-runtime-aggregation-2.0-SNAPSHOT.jar" />
+                   <include name="tuscany-base-runtime-aggregation-2.5-SNAPSHOT.jar" />
                 </fileset>
             </classpath> 
             <arg value="../calculator-contribution.jar"/> 
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/jse/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/jse/pom.xml
index 91d2a8c9bc..4c1c6ed369 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/jse/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-running-tuscany</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>jse</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/junit/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/junit/pom.xml
index 3df9abc7c9..6f93962a15 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/junit/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples-running-tuscany</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>junit</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
index b3600ea2f3..3712edc998 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
 
     </parent>
 
     <artifactId>tuscany-samples-running-tuscany</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Samples Running Tuscany</name>
 
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
index e8df87a914..3e58c20089 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-assembly</artifactId>
@@ -35,19 +35,19 @@
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-asm-tests</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency -->
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -100,14 +100,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-assembly-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-asm-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
index d4f2b56c49..6695dd9d9a 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-binding-jms</artifactId>
@@ -35,20 +35,20 @@
             <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-sca-jms-tests</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -105,14 +105,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-jms-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-sca-jms-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
index f8a50f9c7d..7085f2eb25 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-binding-ws</artifactId>
@@ -35,19 +35,19 @@
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-sca-ws-tests</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency -->
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -102,14 +102,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-ws-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-sca-ws-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
index 9320234d66..4f262ac08b 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-java-caa</artifactId>
@@ -36,20 +36,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 -->
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -108,14 +108,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-javacaa-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
index 8f00333dd1..8a05500091 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-java-ci</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
                    <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -99,14 +99,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-jci-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
index 842ffaf82f..653a94864b 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-policy</artifactId>
@@ -35,19 +35,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-policy-tests</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -105,14 +105,14 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>oasis-policy-contributions</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>zip</type>
                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
                  </artifactItem>
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-policy-tests</artifactId>
-                   <version>2.0-SNAPSHOT</version>
+                   <version>2.5-SNAPSHOT</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
index dfbcb18561..7846441bac 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/T3558/pom.xml b/sca-java-2.x/trunk/testing/itest/T3558/pom.xml
index 49f4619f71..075e185809 100644
--- a/sca-java-2.x/trunk/testing/itest/T3558/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/T3558/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
index 42f107c1ff..da9852312c 100644
--- a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
index 46f57aa04a..237c952a16 100644
--- a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-async-services</artifactId>
@@ -37,24 +37,24 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime-activemq</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
index 1d69f8540b..8f8a62a321 100644
--- a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-base</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
index 2c665183ce..6debcbb0ec 100644
--- a/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
@@ -32,7 +32,7 @@ import org.junit.Test;
  * Current required jars are:
  *    asm-3.1.jar
  *    cglib-2.2.jar
- *    tuscany-base-2.0-SNAPSHOT.jar
+ *    tuscany-base-2.5-SNAPSHOT.jar
  *    wsdl4j-1.6.2.jar
  *    XmlSchema-1.4.3.jar  
  *
diff --git a/sca-java-2.x/trunk/testing/itest/base/pom.xml b/sca-java-2.x/trunk/testing/itest/base/pom.xml
index 930f119cd9..76413786f8 100644
--- a/sca-java-2.x/trunk/testing/itest/base/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
index ebba086d47..6db85ea4cc 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-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-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml
index 7cc80fa468..bf6a243641 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>itest-bpel</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-bpel-helloworld-ws
@@ -37,27 +37,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-bpel-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
index 3359ae6cf7..5b1bac62c4 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>itest-bpel</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-bpel-helloworld</artifactId>
@@ -41,13 +41,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-           <version>2.0-SNAPSHOT</version>
+           <version>2.5-SNAPSHOT</version>
            <scope>runtime</scope>
         </dependency>
 		
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/pom.xml
index 10cc5e27fe..1b9da7c8be 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/builder/pom.xml b/sca-java-2.x/trunk/testing/itest/builder/pom.xml
index a16f3e12cd..f65755fa33 100644
--- a/sca-java-2.x/trunk/testing/itest/builder/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-builder</artifactId>
@@ -33,13 +33,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml
index 5b3340f723..0c4e76b0dc 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-api</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml
index 5f44414fc1..eda52a1b11 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-basic</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml
index a49fcfd510..7600a06ad2 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-complex-type</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml
index d84bf3749e..611fe5ce2b 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-multiple-wires</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml
index b1c64a218f..f5c2afe5ce 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-separatethread</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml
index a813fe19a8..645428bec2 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-two-composites</artifactId>
@@ -33,13 +33,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml
index c7db9362d5..f62d991ca9 100644
--- a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-two-nodes</artifactId>
@@ -33,19 +33,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/testing/itest/component-type/pom.xml b/sca-java-2.x/trunk/testing/itest/component-type/pom.xml
index a8a525c6ea..29edc72ad8 100644
--- a/sca-java-2.x/trunk/testing/itest/component-type/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-component-type</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/context/pom.xml b/sca-java-2.x/trunk/testing/itest/context/pom.xml
index 87c823f0ee..6b814cf43d 100644
--- a/sca-java-2.x/trunk/testing/itest/context/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/context/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
index bd35e462bb..bcf5e9682b 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>contribution-doc-lit-disablewrapped</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
index 88934296a4..fc50a69de1 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>contribution-doc-lit-disablewrapped</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/pom.xml
index e247b73696..c6744ce337 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml
index cd2dfb276a..931f704940 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-folder</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml
index f9bced0907..0e580d9604 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml
@@ -44,7 +44,7 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml
index 58daf0d499..c761397039 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-zip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/corba/pom.xml b/sca-java-2.x/trunk/testing/itest/corba/pom.xml
index b6f8655924..ad4b873e10 100644
--- a/sca-java-2.x/trunk/testing/itest/corba/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/corba/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-corba-binding</artifactId>
@@ -32,55 +32,55 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/client/pom.xml b/sca-java-2.x/trunk/testing/itest/data-copy/client/pom.xml
index 1a15bb987c..09c177a37e 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-data-copy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-data-copy-client</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-data-copy-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/common/pom.xml b/sca-java-2.x/trunk/testing/itest/data-copy/common/pom.xml
index 1441c058ae..0f230917e4 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/common/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-data-copy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-data-copy-common</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/driver/pom.xml b/sca-java-2.x/trunk/testing/itest/data-copy/driver/pom.xml
index 4faaa6a4d0..1e46efbf24 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/driver/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/driver/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-data-copy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-data-copy-driver</artifactId>
@@ -24,22 +24,22 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-data-copy-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
@@ -49,31 +49,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/pom.xml b/sca-java-2.x/trunk/testing/itest/data-copy/pom.xml
index ee31851df4..22aef17e54 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/data-copy/service/pom.xml b/sca-java-2.x/trunk/testing/itest/data-copy/service/pom.xml
index 902b2434c2..5a5140870d 100644
--- a/sca-java-2.x/trunk/testing/itest/data-copy/service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/data-copy/service/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-data-copy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-data-copy-service</artifactId>
@@ -25,27 +25,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-data-copy-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
index 012eccaacf..1b973e5db0 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
 
     <repositories>
@@ -44,13 +44,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
index 8578951712..7ed46ab54c 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>itest-databindings-jaxb-top-down</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
 
     <repositories>
@@ -45,13 +45,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/pom.xml
index 8615b6c370..4358800929 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/pom.xml
@@ -22,13 +22,13 @@
   <parent>
       <groupId>org.apache.tuscany.sca</groupId>
       <artifactId>tuscany-itest</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.tuscany.sca</groupId>
   <artifactId>itest-databindings</artifactId>
   <name>Apache Tuscany SCA Databindings Integration Tests</name>
-  <version>2.0-SNAPSHOT</version>  
+  <version>2.5-SNAPSHOT</version>  
   
   <packaging>pom</packaging>
   <build>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml
index 246119275f..b6569f037e 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bin-distro-unzip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
index 40515d69b5..2e3e0b982d 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-jsonrpc-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index 9a599ac695..a7704b83cc 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-rmi-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
index 69263cd54f..e9f446f4f1 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-sca-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
index 37ed0a2af2..a093c4cb98 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-ws-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
index 0dcd2866d8..7500a2288e 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-implementation-java-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml
index f6d95e214e..80738a9d8d 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-launcher-embedded-jse</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml
index 44c9088237..1373817a42 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-launcher-embedded-osgi</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
index b5130eab80..ac0c66d0e8 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/legal-checks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-legal-checks</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
@@ -56,17 +56,17 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir</basedir>
+                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.5-SNAPSHOT.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
-                              <exclude>tuscany-sca-2.0-SNAPSHOT/CHANGES</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT/CHANGES</exclude>
                               <exclude>**/MANIFEST.MF</exclude>
                               <exclude>**/DEPENDENCIES</exclude>
                               <exclude>**/target/**/*.log</exclude>
                               <exclude>**/config.ini</exclude>
                               <exclude>**/*.odg</exclude>
                               <exclude>**/*.html</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT/features/configuration/config.ini</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT/features/configuration/config.ini</exclude>
                               <exclude>../../../../maven/archetypes/policy/src/test/resources/projects/basic/goal.txt</exclude>
                            </excludes>
                         </configuration>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/pom.xml
index 9e35fde285..dc01c18c7a 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -34,7 +34,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
index 861ffb1c41..e275f3b475 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-rat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-src-dsitro-rat</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-src-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
@@ -56,36 +56,36 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-src.dir</basedir>
+                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.5-SNAPSHOT-src.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/CHANGES</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/CHANGES</exclude>
                               <exclude>**/*.MF</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/testing/itest/spi/spi-safe.txt</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/testing/compliance-tests/binding-ws/sca_variables.dtd</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.handlers</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.schemas</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/maven/archetypes/policy/src/test/resources/projects/basic/goal.txt</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/testing/itest/spi/spi-safe.txt</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/testing/compliance-tests/binding-ws/sca_variables.dtd</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.handlers</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.schemas</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/maven/archetypes/implementation/src/test/resources/projects/basic/goal.txt</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/maven/archetypes/policy/src/test/resources/projects/basic/goal.txt</exclude>
 
                               <!-- these ones we need to implement RAT license processors to handle the non-AL headers, just exclude for now -->
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/assembly-xsd/**/*.*</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/sca-api/**/*.*</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.guid.js</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/*</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/assembly-xsd/**/*.*</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/sca-api/**/*.*</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd04.xml</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.guid.js</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/*</exclude>
+                              <exclude>tuscany-sca-2.5-SNAPSHOT-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties</exclude>
                            </excludes>
                         </configuration>
                     </plugin>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml
index 148208b508..6def58d827 100644
--- a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-src-distro-unzip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/pom.xml
index e5828e867a..9a778c0da8 100644
--- a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,41 +36,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
                       
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
                
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
index 45dbec605a..e1730c4d25 100644
--- a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
@@ -56,7 +56,7 @@ public class Node2TestCase {
     @Test
     public void remoteInstall() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
         Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase");
-        node.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar");
+        node.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.5-SNAPSHOT/helloworld-2.5-SNAPSHOT.jar");
 
         Assert.assertEquals(1, node.getInstalledContributionURIs().size());
         Assert.assertEquals("helloworld", node.getInstalledContributionURIs().get(0));
@@ -69,7 +69,7 @@ public class Node2TestCase {
         TuscanyRuntime runtime = TuscanyRuntime.newInstance();
         try {
         Node nodeA = runtime.createNode("uri:DistributedInstall");
-        nodeA.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar");
+        nodeA.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.5-SNAPSHOT/helloworld-2.5-SNAPSHOT.jar");
         nodeA.installContribution("src/test/resources/export.jar");
 
         Assert.assertEquals(2, nodeA.getInstalledContributionURIs().size());
diff --git a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
index e480d4f534..6d11bd23d3 100644
--- a/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.5-SNAPSHOT</version>
          </plugin>
        </plugins>
     </build>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
index 9abd2df2ba..357cf01ca9 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains-distributed</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-nodep</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/endpoint-uri/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/endpoint-uri/pom.xml
index d60e8a40c3..91e319c982 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/endpoint-uri/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/endpoint-uri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains-enpoint-uri</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml
index 458f5d44d1..6a638e6f43 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains-helloworld</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-domains-interfaces</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -58,7 +58,7 @@
                     <dependency>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-zip-contribution-descriptor</artifactId>
-                        <version>2.0-SNAPSHOT</version>
+                        <version>2.5-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
                 <executions>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml
index f6f7112a61..19bf92e116 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains-interfaces</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/domains/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/pom.xml
index 76286b77bb..1754eafc21 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml
index ab1897793e..69e7d200b9 100644
--- a/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-domains-standalone</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <!-- TODO: shouldnt need to have this dependency, should be in DomainNode -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/dynamicRefURI/pom.xml b/sca-java-2.x/trunk/testing/itest/dynamicRefURI/pom.xml
index 3b45edfc5e..611b0c637c 100644
--- a/sca-java-2.x/trunk/testing/itest/dynamicRefURI/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/dynamicRefURI/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-dynamicrefuri</artifactId>
@@ -37,13 +37,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/endpoints/pom.xml
index 4a962cfdf2..ceeb0eb5c6 100644
--- a/sca-java-2.x/trunk/testing/itest/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/endpoints/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-endpoints</artifactId>
@@ -33,34 +33,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml b/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml
index a8746a4b94..e3860c286d 100644
--- a/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-exceptions</artifactId>
@@ -33,19 +33,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/pom.xml b/sca-java-2.x/trunk/testing/itest/implementation-composite/pom.xml
index 2a09922406..a2f89ccb0e 100644
--- a/sca-java-2.x/trunk/testing/itest/implementation-composite/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/pom.xml
@@ -22,31 +22,31 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-implementation-composite</artifactId>
     <name>Apache Tuscany SCA iTest implementation-composite</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>       
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/testing/itest/implementation-spring/pom.xml
index c4f1743500..f66abeca99 100644
--- a/sca-java-2.x/trunk/testing/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-implementation-spring</artifactId>
@@ -33,19 +33,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
index 22f7070bce..a0faac9688 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-import-export</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
index 83abd2f3a6..c8e19f4850 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-import-export</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-import-export-export</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/pom.xml
index 182203291b..61a255ca27 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
index 4d33c78765..5f376d1c7e 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-import-export</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml b/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml
index 2d476ac232..340617b500 100644
--- a/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/interface-matching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-interface-matching</artifactId>
@@ -33,13 +33,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>      
              
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>      
                 
         <dependency>
@@ -60,19 +60,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>         
         
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml b/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml
index a157492a4a..aa0b619c02 100644
--- a/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-interfaces</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/java-lifecycle-exceptions/pom.xml b/sca-java-2.x/trunk/testing/itest/java-lifecycle-exceptions/pom.xml
index dc159db56e..80dfefadc1 100644
--- a/sca-java-2.x/trunk/testing/itest/java-lifecycle-exceptions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/java-lifecycle-exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-java-lifecycle-exceptions</artifactId>
@@ -34,13 +34,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/trunk/testing/itest/jaxws-asyncclient/pom.xml
index 1f9b339386..5266b115c4 100644
--- a/sca-java-2.x/trunk/testing/itest/jaxws-asyncclient/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jaxws-asyncclient/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jaxws/pom.xml b/sca-java-2.x/trunk/testing/itest/jaxws/pom.xml
index 3566980756..d36a9cd649 100644
--- a/sca-java-2.x/trunk/testing/itest/jaxws/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml
index 9c7ac27e02..8493e4187e 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/args/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/args/pom.xml
index bf823d4afc..9ed5eaa250 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/args/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/args/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml
index ec035111d1..433905cbaa 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms-callbacks</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml
index 975cbc8402..0c5a47f4c5 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml
index c90b9a8eba..51ab901ebf 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml
index 7f6f0512e0..c2f1fa9c0d 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml
index 56a18e111e..ec5ed6fb45 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml
index 0342a115f8..bfd0589f13 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml
index 9834ac5793..0df24a2ba8 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml
index 9e1410860b..40674020fd 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml
index 034b3b8422..c089ab44c3 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml
index f1c145fe2c..a0a7062471 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml
index 6b4b6cf777..11217ddd89 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml
index 0e3a390b6d..4054b63899 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml
index b675c08cab..16c5ad1aa2 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index 82c877065b..4036172b2a 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-wf-writing/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-wf-writing/pom.xml
index 09dae81062..85d9ac6d6a 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/format-wf-writing/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/format-wf-writing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml
index 4df87a7b79..daedeb4aec 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml
index 0cea656978..8b1bc80c1f 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml
index 743f147c82..5a418f1cce 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml
index 8f0fbf861b..8ddb22e308 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms-oneway-nocf</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml
index f0cea616c8..d2db27a0ac 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml
index a70769d850..6de86d2412 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/pom.xml
index 31dc540d4a..412762e52b 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -36,13 +36,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml
index e66d7a5baf..7eae369b48 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml
index 4b0d701f93..53e2fe3308 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml
index 3c9effe9e2..623b2c82b5 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml
index 17b7a42bc7..dd0980dc3a 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml
index 01f6a570c0..73d9b5f2eb 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml
index 5c845d4a52..f5fa536ad0 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml
index a30d518648..7d35f75721 100644
--- a/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-jms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/lifecycle/pom.xml b/sca-java-2.x/trunk/testing/itest/lifecycle/pom.xml
index 618c25a031..824d2877ae 100644
--- a/sca-java-2.x/trunk/testing/itest/lifecycle/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/lifecycle/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-lifecycle</artifactId>
     <name>Apache Tuscany SCA iTest Lifecycle</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
     
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
        
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml
index 8f50d30b69..b65501f159 100644
--- a/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-node-launcher-equinox</artifactId>
@@ -32,40 +32,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency-->
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
index 4107ef2b41..bfd08a66fb 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-binding-sca-hazelcast</artifactId>
@@ -33,22 +33,22 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-tribes/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-tribes/pom.xml
index 0cfb13dd46..905f7cb65a 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-tribes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-tribes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-binding-sca-tribes</artifactId>
@@ -32,39 +32,39 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml
index fd1723a605..86e83c8d4f 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-node-domain-node</artifactId>
@@ -34,13 +34,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 <!--  
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
index a74826b11b..e7d4904433 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-client</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
index bd081db9b6..18949a8fe5 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-iface</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-a/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-a/pom.xml
index e981d2dc4d..57318aed15 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-a/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-a/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-a</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
index edf7c25e8c..77b3c00e44 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-and-client</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-b/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-b/pom.xml
index 49fdb9b562..7ba0af83d7 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-b/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-b</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-c/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-c/pom.xml
index ef7068e0e8..1ffa39fbc5 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-c/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-c/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-Serivce-c</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
index 4d74565f7b..f5f84cda7d 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
index e6c235406f..56dce783d8 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm-hazelcast-client</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
index b2dbc8bea1..c45ea65d23 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm-hazelcast</artifactId>
@@ -32,23 +32,23 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-service-and-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
index f222b4ec6e..727e75e601 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm-tribes</artifactId>
@@ -32,32 +32,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
index 156d92b29d..af7af8f619 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm</artifactId>
@@ -32,22 +32,22 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
index c4a98a8ca2..424197d335 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-node-test</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/pom.xml
index 6b7729d618..6d03581190 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/remote-stop-start/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/remote-stop-start/pom.xml
index 1bb177e012..35550a923f 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/remote-stop-start/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/remote-stop-start/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-nodes</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-remote-stop-start</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -46,7 +46,7 @@
            <plugin>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-maven-plugin</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
              <configuration>
                 <domainURI>uri:StartStopTestCase?bind=127.0.0.1:9876</domainURI>
              </configuration>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
index 2b4e9f5e51..47982070a8 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-three-nodes-three-vms-test</artifactId>
@@ -32,47 +32,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
                             
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
index 1f87322e80..385d2e88db 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
@@ -30,8 +30,8 @@
     <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
 
     <!-- Configure a list of contributions -->
-    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/>
-    <contribution uri="client" location="../helloworld-service-a/target/itest-nodes-helloworld-service-a-2.0-SNAPSHOT.jar">
+    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.5-SNAPSHOT.jar"/>
+    <contribution uri="client" location="../helloworld-service-a/target/itest-nodes-helloworld-service-a-2.5-SNAPSHOT.jar">
         <!-- doesn't pick up the deployable composite properly without this?-->
         <deploymentComposite location="service-a.composite"/>
     </contribution>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/build.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/build.xml
index 684aa97ec8..0c95ee5560 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/build.xml
@@ -22,7 +22,7 @@
        <parallel failonany="true">          
             
             <!-- start a node that will be part of the domain -->
-            <java classpath="../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/classes"        
+            <java classpath="../../../../distribution/all/target/apache-tuscany-sca-all-2.5-SNAPSHOT.dir/tuscany-sca-2.5-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/classes"        
                   classname="org.apache.tuscany.sca.impl.Tuscany"
                   fork="true"
                   failonerror="true">   
@@ -35,7 +35,7 @@
                 <!-- give the first node a chance to start --> 
                 <sleep seconds="5"/>   
                 <!-- start a second node that automatically tries to call a service in the first node -->            
-                <java classpath="../../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/classes"        
+                <java classpath="../../../../distribution/all/target/apache-tuscany-sca-all-2.5-SNAPSHOT.dir/tuscany-sca-2.5-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/classes"        
                       classname="org.apache.tuscany.sca.impl.Tuscany"
                       fork="true"
                       failonerror="true">   
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/pom.xml
index c34cb19736..ce22d36018 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-jvm-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-two-jvm-hazelcast</artifactId>
@@ -34,39 +34,39 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>       
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
         <!-- test artifacts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                             
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-test/pom.xml
index 091f5cbb9e..d477861d33 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-two-nodes-test</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>             
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 5afc1eddfa..2147f8653f 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
@@ -30,8 +30,8 @@
     <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
 
     <!-- Configure a list of contributions -->
-    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/>
-    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar">
+    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.5-SNAPSHOT.jar"/>
+    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.5-SNAPSHOT.jar">
         <!-- doesn't pick up the deployable composite properly without this?-->
         <deploymentComposite location="helloworld-client.composite"/>
     </contribution>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
index 6380733e6d..d9e565f15b 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-two-nodes-two-vms-test</artifactId>
@@ -32,47 +32,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>   
                             
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
index eef3362c10..7c66d5c839 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
+++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
@@ -47,7 +47,7 @@ public class Client {
             throw ex;
         }
         
-//        clientNode = new DomainNode("tribes:default", new String []{"../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});
+//        clientNode = new DomainNode("tribes:default", new String []{"../helloworld-client/target/itest-nodes-helloworld-client-2.5-SNAPSHOT.jar"});
     }
 
     @Test
diff --git a/sca-java-2.x/trunk/testing/itest/oneway/build.xml b/sca-java-2.x/trunk/testing/itest/oneway/build.xml
index 79222717b9..d46d42ba5c 100644
--- a/sca-java-2.x/trunk/testing/itest/oneway/build.xml
+++ b/sca-java-2.x/trunk/testing/itest/oneway/build.xml
@@ -22,96 +22,96 @@
 	
     <path id="repo.classpath">   	
     	<pathelement location="target/classes"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\2.0-SNAPSHOT\tuscany-core-spi-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\2.0-SNAPSHOT\tuscany-host-http-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\2.0-SNAPSHOT\tuscany-binding-ws-axis2-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\2.0-SNAPSHOT\tuscany-policy-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\2.5-SNAPSHOT\tuscany-core-spi-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\2.5-SNAPSHOT\tuscany-host-http-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\2.5-SNAPSHOT\tuscany-binding-ws-axis2-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\2.5-SNAPSHOT\tuscany-policy-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\2.0-SNAPSHOT\tuscany-implementation-java-runtime-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\2.5-SNAPSHOT\tuscany-implementation-java-runtime-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
     	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
     	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\2.0-SNAPSHOT\tuscany-contribution-namespace-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\2.5-SNAPSHOT\tuscany-contribution-namespace-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\2.0-SNAPSHOT\tuscany-assembly-xsd-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\2.0-SNAPSHOT\tuscany-assembly-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\2.5-SNAPSHOT\tuscany-assembly-xsd-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\2.5-SNAPSHOT\tuscany-assembly-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\2.0-SNAPSHOT\tuscany-core-databinding-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\2.5-SNAPSHOT\tuscany-core-databinding-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\2.0-SNAPSHOT\tuscany-policy-xml-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\2.5-SNAPSHOT\tuscany-policy-xml-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\2.0-SNAPSHOT\tuscany-sca-api-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\2.5-SNAPSHOT\tuscany-sca-api-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
     	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
     	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\2.0-SNAPSHOT\tuscany-contribution-java-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\2.5-SNAPSHOT\tuscany-contribution-java-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\2.0-SNAPSHOT\tuscany-databinding-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\2.5-SNAPSHOT\tuscany-databinding-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\2.0-SNAPSHOT\tuscany-binding-ws-xml-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\2.5-SNAPSHOT\tuscany-binding-ws-xml-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
     	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
     	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\2.0-SNAPSHOT\tuscany-policy-security-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\2.0-SNAPSHOT\tuscany-assembly-xml-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\2.5-SNAPSHOT\tuscany-policy-security-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\2.5-SNAPSHOT\tuscany-assembly-xml-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\2.0-SNAPSHOT\tuscany-domain-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\2.5-SNAPSHOT\tuscany-domain-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\2.0-SNAPSHOT\tuscany-interface-java-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\2.5-SNAPSHOT\tuscany-interface-java-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\2.0-SNAPSHOT\tuscany-contribution-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\2.0-SNAPSHOT\tuscany-implementation-java-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\2.5-SNAPSHOT\tuscany-contribution-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\2.5-SNAPSHOT\tuscany-implementation-java-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
     	<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\2.0-SNAPSHOT\tuscany-domain-api-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\2.0-SNAPSHOT\tuscany-binding-sca-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\2.5-SNAPSHOT\tuscany-domain-api-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\2.5-SNAPSHOT\tuscany-binding-sca-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\2.0-SNAPSHOT\tuscany-host-jetty-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\2.5-SNAPSHOT\tuscany-host-jetty-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
     	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\2.0-SNAPSHOT\tuscany-implementation-java-xml-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\2.0-SNAPSHOT\tuscany-binding-sca-xml-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\2.5-SNAPSHOT\tuscany-implementation-java-xml-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\2.5-SNAPSHOT\tuscany-binding-sca-xml-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\2.0-SNAPSHOT\tuscany-interface-wsdl-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\2.0-SNAPSHOT\tuscany-binding-ws-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\2.5-SNAPSHOT\tuscany-interface-wsdl-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\2.5-SNAPSHOT\tuscany-binding-ws-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\2.0-SNAPSHOT\tuscany-databinding-axiom-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\2.5-SNAPSHOT\tuscany-databinding-axiom-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
     	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\2.0-SNAPSHOT\tuscany-core-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\2.0-SNAPSHOT\tuscany-interface-wsdl-xml-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\2.0-SNAPSHOT\tuscany-contribution-impl-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\2.0-SNAPSHOT\tuscany-node-2.0-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\2.0-SNAPSHOT\tuscany-definitions-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\2.5-SNAPSHOT\tuscany-core-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\2.5-SNAPSHOT\tuscany-interface-wsdl-xml-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\2.5-SNAPSHOT\tuscany-contribution-impl-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\2.5-SNAPSHOT\tuscany-node-2.5-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\2.5-SNAPSHOT\tuscany-definitions-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
     	<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>
     	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\2.0-SNAPSHOT\tuscany-host-embedded-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\2.5-SNAPSHOT\tuscany-host-embedded-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
     	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
     	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
     	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\2.0-SNAPSHOT\tuscany-interface-java-xml-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\2.5-SNAPSHOT\tuscany-interface-java-xml-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
     	<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>
     	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\2.0-SNAPSHOT\tuscany-interface-2.0-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\2.5-SNAPSHOT\tuscany-interface-2.5-SNAPSHOT.jar"/>
     	<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>  	
    </path>	
     	
diff --git a/sca-java-2.x/trunk/testing/itest/oneway/pom.xml b/sca-java-2.x/trunk/testing/itest/oneway/pom.xml
index 909220d7b2..48facb9f79 100644
--- a/sca-java-2.x/trunk/testing/itest/oneway/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/oneway/pom.xml
@@ -22,25 +22,25 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-oneway</artifactId>
     <name>Apache Tuscany SCA iTest OneWay</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/operation-overloading/pom.xml b/sca-java-2.x/trunk/testing/itest/operation-overloading/pom.xml
index 48410a4b47..97b713e800 100644
--- a/sca-java-2.x/trunk/testing/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/operation-overloading/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-operation-overloading</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/pom.xml b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/pom.xml
index e382e2168d..654fcea433 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <artifactId>itest-performance-contribution1</artifactId>
     <name>Apache Tuscany SCA iTest Performance Contribution1</name>
@@ -32,19 +32,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml b/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml
index 73990136d5..91f09ca45d 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <artifactId>itest-performance-test</artifactId>
     <name>Apache Tuscany SCA iTest Performance Test</name>
@@ -32,25 +32,25 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
                
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java b/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java
index d05ed1fd74..cff64f11c7 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java
@@ -292,7 +292,7 @@ public class PerformanceTestCase {
     
     public void installContribution() {
         try {
-            node.installContribution("performance", "../performance-contribution1/target/itest-performance-contribution1-2.0-SNAPSHOT.jar", null, null);
+            node.installContribution("performance", "../performance-contribution1/target/itest-performance-contribution1-2.5-SNAPSHOT.jar", null, null);
         } catch (Exception ex){
             ex.printStackTrace();
         }
diff --git a/sca-java-2.x/trunk/testing/itest/performance/pom.xml b/sca-java-2.x/trunk/testing/itest/performance/pom.xml
index 11bae8971e..4306f0fc32 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/performance/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-performance</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/policies/pom.xml b/sca-java-2.x/trunk/testing/itest/policies/pom.xml
index 98ea6b016a..5708e3e754 100644
--- a/sca-java-2.x/trunk/testing/itest/policies/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policies/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policies</artifactId>
@@ -33,12 +33,12 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <!--  TODO: this test requires woodtox as it fails with the JDK parser which 
                     presumably means Tuscany doesn't work properly without woodstox -->
diff --git a/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml b/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml
index a2b18c6a51..2c48a8a04f 100644
--- a/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-transaction</artifactId>
@@ -33,12 +33,12 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
         <dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/interceptors/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/interceptors/pom.xml
index 317fd4edb9..9469de16cc 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/interceptors/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/interceptors/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-policy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
index 53758ef427..604eedc9ce 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-policy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/operations/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/operations/pom.xml
index 775ebbd22e..cf77d8b7fe 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/operations/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/operations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-policy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,31 +35,31 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
              
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>  
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency> 
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/pom.xml
index 07998c97d7..68cdcfd84e 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/reliability/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/reliability/pom.xml
index b52c4e7344..099fec5249 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/reliability/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/reliability/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-policy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
index 2e04d32802..27f79db4c0 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-policy</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,19 +35,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
              
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/pom.xml b/sca-java-2.x/trunk/testing/itest/pom.xml
index af1d48f30d..4fa30c682b 100644
--- a/sca-java-2.x/trunk/testing/itest/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/properties/pom.xml b/sca-java-2.x/trunk/testing/itest/properties/pom.xml
index 8df05dee37..0707153d65 100644
--- a/sca-java-2.x/trunk/testing/itest/properties/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/properties/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-properties</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml b/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml
index 0006664647..a2c205cea8 100644
--- a/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>itest-recursive-multi-level</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/references/pom.xml b/sca-java-2.x/trunk/testing/itest/references/pom.xml
index f21d7095f6..840fd1a3c2 100644
--- a/sca-java-2.x/trunk/testing/itest/references/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-references</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/samples/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/samples/helloworld/pom.xml
index c8817be0f2..b1b758631b 100644
--- a/sca-java-2.x/trunk/testing/itest/samples/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/samples/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-samples-helloworld</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/pom.xml b/sca-java-2.x/trunk/testing/itest/scabindingmapper/pom.xml
index f6d2894f57..38c937c31b 100644
--- a/sca-java-2.x/trunk/testing/itest/scabindingmapper/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api-jse-osgi/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api-jse-osgi/pom.xml
index 2e0ff027b9..c51549a1e0 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api-jse-osgi/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api-jse-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api-jse-osgi</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml
index 0c29c06c97..173ea3f845 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api-osgi</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>    
 
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml
index dc3aaee271..33c182d8bc 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api-remote</artifactId>
@@ -33,13 +33,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml
index 1b7ef1257c..da63eee8dd 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api</artifactId>
@@ -33,22 +33,22 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-remote/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-remote/pom.xml
index 2ff5e5b461..a5a6f08a17 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-remote/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-remote/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-remote</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -46,7 +46,7 @@
            <plugin>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-maven-plugin</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
              <configuration>
                 <domainURI>uri:default?bind=127.0.0.1:9876</domainURI>
              </configuration>
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
index a1f86c8171..9e11b33009 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index 8b8abd3a4e..ec805390eb 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
@@ -35,7 +35,7 @@ import org.junit.Test;
  * asm-3.1.jar
  * cglib-2.2.jar
  * junit-4.8.1.jar
- * tuscany-base-runtime-2.0-SNAPSHOT.jar
+ * tuscany-base-runtime-2.5-SNAPSHOT.jar
  * wsdl4j-1.6.2.jar
  * XmlSchema-1.4.3.jar
  * 
diff --git a/sca-java-2.x/trunk/testing/itest/scopes/pom.xml b/sca-java-2.x/trunk/testing/itest/scopes/pom.xml
index ed25620489..f7be1cd7a9 100644
--- a/sca-java-2.x/trunk/testing/itest/scopes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Apache Tuscany SCA iTest Scopes</name>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml
index c55f04e369..b8aa7c71a4 100644
--- a/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-service-reference</artifactId>
@@ -33,13 +33,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>    
 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/services/pom.xml b/sca-java-2.x/trunk/testing/itest/services/pom.xml
index 606960351d..a5115b1dc5 100644
--- a/sca-java-2.x/trunk/testing/itest/services/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-services</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/spi/pom.xml b/sca-java-2.x/trunk/testing/itest/spi/pom.xml
index adebf71441..19b66b5411 100644
--- a/sca-java-2.x/trunk/testing/itest/spi/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/spi/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-spi</artifactId>
     <name>Apache Tuscany SCA iTest SPI</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
     
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency> 
        
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/wires/pom.xml b/sca-java-2.x/trunk/testing/itest/wires/pom.xml
index f77ae68fd1..74fe17ceab 100644
--- a/sca-java-2.x/trunk/testing/itest/wires/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wires</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index cba18490de..b93bcb131b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws-jaxws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index 4bd87ed35b..076bdd8c06 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws-jaxws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
index ad5e63dbfa..476d5bdc63 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws-jaxws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
index f4c4cc899e..edd1f0c866 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws-jaxws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
index dc08db9fac..a064de600b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws-jaxws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,20 +34,20 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Test resources -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-jaxws-external-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-jaxws-external-service</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/pom.xml
index f8c19205e9..7c45f897c5 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
index 399559fc02..3a56831c62 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index 7086592b50..de51b77d6b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 335bcafa49..db6d850331 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
index 6f73aad7e9..74ec901a65 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-wsdl-iface/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-wsdl-iface/pom.xml
index f8a1ae0c02..39e33318d5 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-wsdl-iface/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-wsdl-iface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
index 83fdd40331..f421a2e1bd 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml
index 9b463cae2a..0cc65c0604 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped-dom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index 74fa83e5c2..866ca5944f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
index 6abe9cc4c7..f1ca66ce49 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
index 72568d5930..90383dec51 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
index cd2f29f1ce..f38425c50c 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
index f79b71d38a..a7cf2c8199 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
index b874f0375b..3f511d6a15 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
index 36a664af94..85e7784a8d 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
index 3895a742dc..1454c71e81 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
index 24a38b1ac0..a3d7f58dff 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
index 7dc0fa5070..6b59660eba 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
index 11e6754e0e..effbe751ea 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
index cadde52bbc..23aa6a2552 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,71 +34,71 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>     
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -116,7 +116,7 @@
          <plugin>
              <groupId>org.apache.tuscany.sca</groupId>
              <artifactId>tuscany-maven-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
+             <version>2.5-SNAPSHOT</version>
          </plugin>
        </plugins>
     </build>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
index cb3880d575..b41f9fbbf7 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
index 6b72686395..6b0ea3f504 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-service</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml
index 72a732f8e6..b041c119e7 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
         <!-- Test resources -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-service</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
                 
     </dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/pom.xml
index adb471939e..a9af04d752 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
index 4c303c596b..bb1cb3d30f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/pom.xml
index 35e77a80fd..c5f1fc2ae4 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-ws-wsdlgen</artifactId>
@@ -34,19 +34,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>       
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/pom.xml
index b1fd0a7512..dbf150c2a1 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-ws</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,13 +35,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
        </dependency>
                 
         <dependency>
diff --git a/sca-java-2.x/trunk/unreleased/distribution/osgi/pom.xml b/sca-java-2.x/trunk/unreleased/distribution/osgi/pom.xml
index 24b8edbd28..bcd539e3f9 100644
--- a/sca-java-2.x/trunk/unreleased/distribution/osgi/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/distribution/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuscany-distribution-osgi</artifactId>
@@ -68,14 +68,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>        
 
         <!-- needed for the unit test which produces the feature repository.xml files -->
        <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-sca-api</artifactId>
-           <version>2.0-SNAPSHOT</version>
+           <version>2.5-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency> 
                
@@ -250,116 +250,116 @@
                                  <feature>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-base-runtime-pom</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </feature>
                              </features>
                              <extensions>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-atom-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-commet-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-corba-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ejb-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-hazelcase-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jms-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rest-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rmi-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rss-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-jaxes-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-python-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-script-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-spring-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-web-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-widget-runtime</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-host-jetty</artifactId>
-                                     <version>2.0-SNAPSHOT</version>
+                                     <version>2.5-SNAPSHOT</version>
                                  </extension>
                              </extensions>
                             <artifactManifests>
diff --git a/sca-java-2.x/trunk/unreleased/samples/applications/pom.xml b/sca-java-2.x/trunk/unreleased/samples/applications/pom.xml
index 039b6dca16..6bb3abe485 100644
--- a/sca-java-2.x/trunk/unreleased/samples/applications/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/applications/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     
     <artifactId>tuscany-samples-applications</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany Sample Applications</name>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/applications/store/pom.xml b/sca-java-2.x/trunk/unreleased/samples/applications/store/pom.xml
index c088d528da..f02e1361a4 100644
--- a/sca-java-2.x/trunk/unreleased/samples/applications/store/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/applications/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <artifactId>sample-store</artifactId>
     <name>Apache Tuscany SCA Sample Getting Started Online Store</name>
@@ -31,43 +31,43 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
             <type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>2.5-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-scaclient/pom.xml
index 4b916a6bca..4d0f9db001 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-scaclient/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath/> 
    </parent>
 
    <artifactId>helloworld-scaclient</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld SCAClient</name>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
index a804b3f0a3..260edcffe6 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath/> 
    </parent>
 
    <artifactId>helloworld-webapp</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld WebApp</name>
    <packaging>war</packaging>
diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld/pom.xml b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld/pom.xml
index 6f4f92c230..dcae779668 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld/pom.xml
@@ -24,12 +24,12 @@
    <parent>
       <groupId>org.apache.tuscany.sca.samples</groupId>
       <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
       <relativePath/> 
    </parent>
 
    <artifactId>helloworld</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
 
    <name>Apache Tuscany SCA Samples Helloworld</name>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/pom.xml b/sca-java-2.x/trunk/unreleased/samples/getting-started/pom.xml
index 378b6a2c31..80befc7e04 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuscany-samples-getting-started</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Samples Getting Started</name>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-contribution2/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-contribution2/pom.xml
index d87706a3bc..7eb3683756 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-contribution2/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-contribution2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
    <groupId>org.apache.tuscany.sca.samples</groupId>
@@ -37,7 +37,7 @@
       <dependency>
          <groupId>org.apache.tuscany.sca</groupId>
          <artifactId>tuscany-sca-api</artifactId>
-         <version>2.0-SNAPSHOT</version>
+         <version>2.5-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-http-contribution/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-http-contribution/pom.xml
index b7438179e2..44beadb733 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-http-contribution/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-http-contribution/pom.xml
@@ -24,19 +24,19 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
    <groupId>org.apache.tuscany.sca.samples</groupId>
    <artifactId>helloworld-http-contribution</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
    <packaging>jar</packaging>
 
    <name>Tuscany Sample Helloworld Rest Contribution</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
    </properties>
 
    <dependencies>
@@ -72,7 +72,7 @@
       <dependency>
          <groupId>org.apache.tuscany.sca</groupId>
          <artifactId>tuscany-databinding-json</artifactId>
-         <version>2.0-SNAPSHOT</version>
+         <version>2.5-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
 
@@ -103,7 +103,7 @@
                <dependency>
                   <groupId>org.apache.tuscany.sca</groupId>
                   <artifactId>tuscany-databinding-json</artifactId>
-                  <version>2.0-SNAPSHOT</version>
+                  <version>2.5-SNAPSHOT</version>
                </dependency>
             </dependencies>
          </plugin>
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution/pom.xml
index 91b18fe830..d1ebb70396 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution/pom.xml
@@ -24,19 +24,19 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
    <groupId>org.apache.tuscany.sca.samples</groupId>
    <artifactId>helloworld-rest-contribution</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
    <packaging>jar</packaging>
 
    <name>Tuscany Sample Helloworld Rest Contribution</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
    </properties>
 
    <dependencies>
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml
index 8c4f6e021e..54a7c89ec0 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml
@@ -24,19 +24,19 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
    <groupId>org.apache.tuscany.sca.samples</groupId>
    <artifactId>helloworld-rest-contribution2</artifactId>
-   <version>2.0-SNAPSHOT</version>
+   <version>2.5-SNAPSHOT</version>
    <packaging>jar</packaging>
 
    <name>Tuscany Sample Helloworld Rest Contribution2</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
    </properties>
 
    <dependencies>
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/pom.xml
index 3ae3b678e2..22101b0b49 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
    <name>Tuscany Sample Helloworld using Spring Contribution</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-web-contribution/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-web-contribution/pom.xml
index 25eb1d1a0f..aad5eb2e97 100644
--- a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-web-contribution/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-web-contribution/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
    <name>Tuscany Sample Helloworld using Spring and binding http/rest Contribution</name>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
 
@@ -76,7 +76,7 @@
       <dependency>
          <groupId>org.apache.tuscany.sca</groupId>
          <artifactId>tuscany-databinding-json</artifactId>
-         <version>2.0-SNAPSHOT</version>
+         <version>2.5-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
 
diff --git a/sca-java-2.x/trunk/unreleased/testing/itest/bundle/pom.xml b/sca-java-2.x/trunk/unreleased/testing/itest/bundle/pom.xml
index 8551971700..503bb0758f 100644
--- a/sca-java-2.x/trunk/unreleased/testing/itest/bundle/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/testing/itest/bundle/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
    <artifactId>bundle</artifactId>
@@ -32,7 +32,7 @@
    <packaging>bundle</packaging>
 
    <properties>
-      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+      <tuscany.version>2.5-SNAPSHOT</tuscany.version>
    </properties>
 
    <dependencies>     
@@ -47,7 +47,7 @@
        <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-sca-api</artifactId>
-           <version>2.0-SNAPSHOT</version>
+           <version>2.5-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>