set trunk version to 1.2-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/tuscany/java/sdo@680718 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f0e5c50..cc8df2d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,7 +33,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<tuscany.version>${pom.version}</tuscany.version>
- <sdo.previousversion>1.0-incubating-beta1</sdo.previousversion>
+ <sdo.previousversion>1.1.1</sdo.previousversion>
</properties>
<!-- in the sca build the bundle module is creating the merged jar which contains all the tuscany
diff --git a/impl/pom.xml b/impl/pom.xml
index 770bb6d..5f8f45b 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-impl</artifactId>
@@ -129,7 +129,7 @@
<archive>
<manifestEntries>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>1.1-incubating</Implementation-Version>
+ <Implementation-Version>${version}</Implementation-Version>
<X-Compile-Source-JDK>1.4</X-Compile-Source-JDK>
<X-Compile-Target-JDK>1.4</X-Compile-Target-JDK>
</manifestEntries>
diff --git a/java5tools/pom.xml b/java5tools/pom.xml
index 9e9cb94..e2b80f9 100644
--- a/java5tools/pom.xml
+++ b/java5tools/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-java5tools</artifactId>
<name>Tuscany SDO Java5 Tools</name>
<description>SDO Java5 Tools.</description>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<build>
<plugins>
diff --git a/lib/pom.xml b/lib/pom.xml
index 8b9d7f9..2a22412 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-lib</artifactId>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 2807a27..c58fd5e 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-plugin</artifactId>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index bedfc13..37bdbfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,15 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>parent</artifactId>
- <version>3-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
</parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SDO Implementation Project</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/java/sdo</connection>
@@ -48,17 +48,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>apache.incubator</id>
- <name>Apache Incubator Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+
<repository>
<!-- <id>eclipse.emf</id>
<url>http://download.eclipse.org/tools/emf/maven2</url> -->
@@ -208,7 +198,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/sdo-api/pom.xml b/sdo-api/pom.xml
index e3249d9..3f50cc5 100644
--- a/sdo-api/pom.xml
+++ b/sdo-api/pom.xml
@@ -20,14 +20,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>parent</artifactId>
- <version>2-incubating-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
</parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<name>SDO API</name>
<description>API classes for Service Data Objects</description>
@@ -48,17 +48,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>apache.incubator</id>
- <name>Apache Incubator Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+
</repositories>
<dependencies>
diff --git a/tools-test/pom.xml b/tools-test/pom.xml
index 7f31746..1a44ddb 100644
--- a/tools-test/pom.xml
+++ b/tools-test/pom.xml
@@ -21,11 +21,12 @@
<parent>
<artifactId>tuscany-sdo</artifactId>
<groupId>org.apache.tuscany.sdo</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-tools-test</artifactId>
+ <version>1.2-SNAPSHOT</version>
<name>Test the SDO Generator Tools and Tool Outputs</name>
<dependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index 21a6333..dad0912 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-tools</artifactId>
@@ -102,7 +102,7 @@
<archive>
<manifestEntries>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>1.1-incubating</Implementation-Version>
+ <Implementation-Version>${version}</Implementation-Version>
<X-Compile-Source-JDK>1.4</X-Compile-Source-JDK>
<X-Compile-Target-JDK>1.4</X-Compile-Target-JDK>
</manifestEntries>
