update branch version

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

9 files changed, 144 insertions, 144 deletions

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml
index d9793d810d..1d858b7eb0 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>itest-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>itest-bin-distro-unzip</artifactId>

-    <name>Apache Tuscany SCA iTest Distribution Bin Distro Unzip</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-    <!-- HACK: use profile to control if we need to add tools.jar  -->

-    <!-- Mac OS doesn't have tools.jar -->

-    <profiles>

-        <profile>

-            <id>not-sun-jdk</id>

-            <activation>

-                <file>

-                    <missing>${java.home}/../lib/tools.jar</missing>

-                </file>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

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

-                        <artifactId>maven-antrun-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>run-samples</id>

-                                <phase>verify</phase>

-                                <goals>

-                                    <goal>run</goal>

-                                </goals>

-                                <configuration>

-                                    <tasks>

-                                        <property name="java.home" value="${java.home}"/>

-                                        <property name="tuscany.version" value="${version}" />

-                                        <ant antfile="./build.xml" />

-                                    </tasks>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-

-        <profile>

-            <id>sun-jdk</id>

-            <activation>

-                <file>

-                    <exists>${java.home}/../lib/tools.jar</exists>

-                </file>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

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

-                        <artifactId>maven-antrun-plugin</artifactId>

-                        <version>1.3</version>

-

-                        <dependencies>

-                            <dependency>

-                                <groupId>ant</groupId>

-                                <artifactId>ant-trax</artifactId>

-                                <version>1.6.5</version>

-                            </dependency>

-                            <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

-                            <dependency>

-                                <groupId>sun.jdk</groupId>

-                                <artifactId>tools</artifactId>

-                                <version>1.6</version>

-                                <scope>system</scope>

-                                <systemPath>${java.home}/../lib/tools.jar</systemPath>

-                            </dependency>

-                        </dependencies>

-

-                        <executions>

-                            <execution>

-                                <id>run-samples</id>

-                                <phase>verify</phase>

-                                <goals>

-                                    <goal>run</goal>

-                                </goals>

-                                <configuration>

-                                    <tasks>

-                                        <property name="java.home" value="${java.home}"/>

-                                        <property name="tuscany.version" value="${version}" />

-                                        <ant antfile="./build.xml" />

-                                    </tasks>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-    </profiles>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-distribution</artifactId>
+        <version>2.0-M5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bin-distro-unzip</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Bin Distro Unzip</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-all</artifactId>
+            <type>pom</type>
+            <version>2.0-M5-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <!-- HACK: use profile to control if we need to add tools.jar  -->
+    <!-- Mac OS doesn't have tools.jar -->
+    <profiles>
+        <profile>
+            <id>not-sun-jdk</id>
+            <activation>
+                <file>
+                    <missing>${java.home}/../lib/tools.jar</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-samples</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <property name="java.home" value="${java.home}"/>
+                                        <property name="tuscany.version" value="${version}" />
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sun-jdk</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant</groupId>
+                                <artifactId>ant-trax</artifactId>
+                                <version>1.6.5</version>
+                            </dependency>
+                            <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                            <dependency>
+                                <groupId>sun.jdk</groupId>
+                                <artifactId>tools</artifactId>
+                                <version>1.6</version>
+                                <scope>system</scope>
+                                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                            </dependency>
+                        </dependencies>
+
+                        <executions>
+                            <execution>
+                                <id>run-samples</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <property name="java.home" value="${java.home}"/>
+                                        <property name="tuscany.version" value="${version}" />
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index 2f3f04c1f5..9f8b404953 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml
index 5ea30a20f7..ee49eb725e 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml
index c598f122e0..d2c8462e0d 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml
index a0a1790c00..a152f63362 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml
index 93bd2e3327..c9f9ba92e0 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml
index 0e4a97a07f..05fe579d42 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml
index 3be416937e..801e81df90 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml
index fedd34c7a5..f9830cc239 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/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.0-M5-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.0-M5-SNAPSHOT</version>
         </dependency>
     </dependencies>