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

24 files changed, 38 insertions, 38 deletions

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>