You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/07/11 23:36:46 UTC
svn commit: r420995 - in /incubator/tuscany/java: das/rdb/pom.xml
sca/model/pom.xml sca/tools/pom.xml sdo/impl/pom.xml sdo/plugin/pom.xml
sdo/pom.xml sdo/tools/pom.xml
Author: jboynes
Date: Tue Jul 11 14:36:45 2006
New Revision: 420995
URL: http://svn.apache.org/viewvc?rev=420995&view=rev
Log:
update SDO version and upgrade to 2.2.0 version of EMF
Modified:
incubator/tuscany/java/das/rdb/pom.xml
incubator/tuscany/java/sca/model/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/sdo/impl/pom.xml
incubator/tuscany/java/sdo/plugin/pom.xml
incubator/tuscany/java/sdo/pom.xml
incubator/tuscany/java/sdo/tools/pom.xml
Modified: incubator/tuscany/java/das/rdb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/pom.xml (original)
+++ incubator/tuscany/java/das/rdb/pom.xml Tue Jul 11 14:36:45 2006
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/model/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/pom.xml (original)
+++ incubator/tuscany/java/sca/model/pom.xml Tue Jul 11 14:36:45 2006
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Tue Jul 11 14:36:45 2006
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -53,14 +53,14 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
- <version>2.2.0-RC4</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
- <version>2.2.0-RC4</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Jul 11 14:36:45 2006
@@ -18,23 +18,12 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-impl</artifactId>
<name>Tuscany SDO Implementation</name>
<description>Tuscany implementation of SDO API.</description>
- <version>incubating-M1</version>
-
- <repositories>
- <repository>
- <id>eclipse.emf</id>
- <url>http://download.eclipse.org/tools/emf/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
@@ -50,6 +39,7 @@
<version>1.0</version>
<!-- mark as provided to avoid adding this to the classpath for users that are not using StAX -->
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -70,39 +60,37 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-change</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-xmi</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sdo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/plugin/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/plugin/pom.xml (original)
+++ incubator/tuscany/java/sdo/plugin/pom.xml Tue Jul 11 14:36:45 2006
@@ -18,12 +18,11 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>incubating-M1</version>
<name>Tuscany SDO Maven Plugin</name>
<dependencies>
Modified: incubator/tuscany/java/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Tue Jul 11 14:36:45 2006
@@ -15,16 +15,30 @@
* limitations under the License.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-project</artifactId>
- <version>incubating-M1</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo</artifactId>
<packaging>pom</packaging>
<name>Tuscany SDO Implementation Project</name>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
+
+ <repositories>
+ <repository>
+ <id>eclipse.emf</id>
+ <url>http://download.eclipse.org/tools/emf/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jsdelfino</id>
+ <url>http://people.apache.org/~jsdelfino/maven2</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <emfVersion>2.2.0</emfVersion>
+ </properties>
<modules>
<module>impl</module>
@@ -33,6 +47,8 @@
</modules>
<build>
+ <defaultGoal>install</defaultGoal>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -53,4 +69,15 @@
</plugin>
</plugins>
</build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/pom.xml?rev=420995&r1=420994&r2=420995&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Tue Jul 11 14:36:45 2006
@@ -18,51 +18,38 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-tools</artifactId>
<name>Tuscany SDO Tools</name>
<description>SDO Tools.</description>
- <version>incubating-M1</version>
-
- <repositories>
- <repository>
- <id>eclipse.emf</id>
- <url>http://download.eclipse.org/tools/emf/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>incubating-M1</version>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
- <version>2.2.0-RC4</version>
+ <version>${emfVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org