Moving trunk to 2.5-SNAPSHOT now that 2.0 is ready

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

12 files changed, 22 insertions, 22 deletions

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>