TUSCANY-2416 - Fixing up parent pom to remove incubating from artifact version, updating distributionManagement section, and also bumding up its version

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

6 files changed, 13 insertions, 17 deletions

diff --git a/java/das/pom.xml b/java/das/pom.xml
index ce2502ef2d..8b1d11d6a9 100644
--- a/java/das/pom.xml
+++ b/java/das/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany</groupId>
         <artifactId>parent</artifactId>
-        <version>2-incubating-SNAPSHOT</version>
+        <version>3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.das</groupId>
     <artifactId>tuscany-das</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index d80081c2b5..893c631110 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tuscany</groupId>
     <artifactId>tuscany-project</artifactId>
-    <version>1.0-incubating-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany Project</name>
     <url>http://tuscany.apache.org</url>
@@ -47,7 +47,6 @@
                 <module>sdo</module>
                 <module>das</module>
                 <module>sca</module>
-                <!-- <module>distribution</module> -->
             </modules>
         </profile>
 
diff --git a/java/pom/parent/pom.xml b/java/pom/parent/pom.xml
index 4cde4939b4..e2678f0b85 100644
--- a/java/pom/parent/pom.xml
+++ b/java/pom/parent/pom.xml
@@ -22,17 +22,17 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>3</version>
+        <version>4</version>
     </parent>
     <groupId>org.apache.tuscany</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany Project Parent</name>
     <description>Parent POM defining settings that can be used across Tuscany</description>
-    <version>2-incubating-SNAPSHOT</version>
+    <version>3-SNAPSHOT</version>
 
     <prerequisites>
-        <maven>2.0.4</maven>
+        <maven>2.0.6</maven>
     </prerequisites>
 
     <properties>
@@ -69,7 +69,7 @@
         <pluginRepository>
             <id>apache.incubator</id>
             <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
+            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -103,17 +103,14 @@
     </pluginRepositories>
 
     <distributionManagement>
-        <!--
-            Whilst in incubation, released project artifacts are deployed to the incubator repository 
-        -->
         <repository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
+            <id>apache.releases</id>
+            <name>Apache Release Distribution Repository</name>
+            <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
         </repository>
         <snapshotRepository>
             <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
+            <name>Apache Development Snapshot Repository</name>
             <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
         </snapshotRepository>
     </distributionManagement>
diff --git a/java/sca/pom.xml b/java/sca/pom.xml
index 20a72e7940..600760993a 100644
--- a/java/sca/pom.xml
+++ b/java/sca/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany</groupId>
         <artifactId>parent</artifactId>
-        <version>2-incubating</version>
+        <version>3-SNAPSHOT</version>
         <relativePath>../pom/parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/java/sdo-cts/pom.xml b/java/sdo-cts/pom.xml
index 59b7dc0616..49bdbd9bb2 100644
--- a/java/sdo-cts/pom.xml
+++ b/java/sdo-cts/pom.xml
@@ -21,7 +21,7 @@
   <parent>
 	<groupId>org.apache.tuscany</groupId>
 	<artifactId>parent</artifactId>
-        <version>2-incubating</version>
+        <version>3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/sdo/pom.xml b/java/sdo/pom.xml
index 2475f52340..bedfc13e97 100644
--- a/java/sdo/pom.xml
+++ b/java/sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany</groupId>
         <artifactId>parent</artifactId>
-        <version>2-incubating-SNAPSHOT</version>
+        <version>3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sdo</groupId>
     <artifactId>tuscany-sdo</artifactId>