26 files changed, 86 insertions, 86 deletions
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>