Moving all samples to 1.7-SNAPSHOT

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

7 files changed, 39 insertions, 90 deletions

diff --git a/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml b/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml
index 9d874bf18c..0354a8265a 100644
--- a/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml
+++ b/sandbox/lresende/sca/samples/calculator-jsf-webapp/pom.xml
@@ -22,20 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.2-incubating-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-calculator-jsf-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Calculator Sample using JSF in a WebApp</name>
 
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
     <dependencies>
 	<dependency>
 	    <groupId>org.apache.myfaces.core</groupId>
@@ -52,13 +44,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.2-incubating-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -81,19 +73,5 @@
 
     <build>
        <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.2-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
     </build>
 </project>
diff --git a/sandbox/lresende/sca/samples/expertise-atom/pom.xml b/sandbox/lresende/sca/samples/expertise-atom/pom.xml
index 4cefa601c2..54840dca7e 100644
--- a/sandbox/lresende/sca/samples/expertise-atom/pom.xml
+++ b/sandbox/lresende/sca/samples/expertise-atom/pom.xml
@@ -21,9 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-expertise-atom</artifactId>
     <name>Apache Tuscany SCA ATOM Expertise Locator</name>
@@ -32,60 +31,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                
     </dependencies>
diff --git a/sandbox/lresende/sca/samples/expertise-restfull/pom.xml b/sandbox/lresende/sca/samples/expertise-restfull/pom.xml
index 32decad47f..8d5459be84 100644
--- a/sandbox/lresende/sca/samples/expertise-restfull/pom.xml
+++ b/sandbox/lresende/sca/samples/expertise-restfull/pom.xml
@@ -21,9 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-expertise-restfull</artifactId>
     <name>Apache Tuscany SCA RESTFull Expertise Locator</name>
@@ -32,39 +31,39 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                            
         
diff --git a/sandbox/lresende/sca/samples/pom.xml b/sandbox/lresende/sca/samples/pom.xml
index ccc9a2d7be..e481abc47a 100644
--- a/sandbox/lresende/sca/samples/pom.xml
+++ b/sandbox/lresende/sca/samples/pom.xml
@@ -19,12 +19,11 @@
 -->

 <project>

     <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

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

-    </parent>

+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.7-SNAPSHOT</version>
+    </parent>
     <artifactId>tuscany-samples-lresende</artifactId>

     <packaging>pom</packaging>

     <name>Apache Tuscany Samples (lresende sandbox)</name>

diff --git a/sandbox/lresende/sca/samples/store-distributed/pom.xml b/sandbox/lresende/sca/samples/store-distributed/pom.xml
index 5d2256b362..bb24b6cedd 100644
--- a/sandbox/lresende/sca/samples/store-distributed/pom.xml
+++ b/sandbox/lresende/sca/samples/store-distributed/pom.xml
@@ -22,84 +22,75 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-store-distributed</artifactId>
     <name>Apache Tuscany SCA Getting Started Online Store Sample</name>
 
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
     <dependencies>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -109,7 +100,6 @@
             <version>4.2</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     
     <build>
diff --git a/sandbox/lresende/sca/samples/store-jsf/pom.xml b/sandbox/lresende/sca/samples/store-jsf/pom.xml
index f1ca99bd5f..fe68a0e4b5 100644
--- a/sandbox/lresende/sca/samples/store-jsf/pom.xml
+++ b/sandbox/lresende/sca/samples/store-jsf/pom.xml
@@ -22,20 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.2-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-store-jsf</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Getting Started Online Store Sample using JSF</name>
 
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
     <dependencies>
        
 		<dependency>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml b/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
index fd401a0764..b95dda30fd 100644
--- a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
+++ b/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
@@ -23,19 +23,11 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <version>1.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-secure-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Sample Store in a WebApp</name>
 
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>