You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/09/26 01:43:44 UTC
svn commit: r579414 - in /incubator/tuscany/java/sdo: impl/pom.xml
lib/pom.xml plugin/pom.xml pom.xml sample/pom.xml tools/pom.xml
Author: lresende
Date: Tue Sep 25 16:43:41 2007
New Revision: 579414
URL: http://svn.apache.org/viewvc?rev=579414&view=rev
Log:
Dependencies changes to allow building from Maven 2.0.7 from a clean repo
Modified:
incubator/tuscany/java/sdo/impl/pom.xml
incubator/tuscany/java/sdo/lib/pom.xml
incubator/tuscany/java/sdo/plugin/pom.xml
incubator/tuscany/java/sdo/pom.xml
incubator/tuscany/java/sdo/sample/pom.xml
incubator/tuscany/java/sdo/tools/pom.xml
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Sep 25 16:43:41 2007
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-lib</artifactId>
- <version>${pom.version}</version>
+ <version>${sdo.version}</version>
<scope>compile</scope>
</dependency>
@@ -75,11 +75,11 @@
<scope>compile</scope>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.0</version>
- </dependency>
+ </dependency -->
<!-- dependencies for optional code generation functions -->
<dependency>
@@ -96,6 +96,7 @@
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>
+
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
@@ -106,6 +107,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sdo/lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/lib/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/lib/pom.xml (original)
+++ incubator/tuscany/java/sdo/lib/pom.xml Tue Sep 25 16:43:41 2007
@@ -41,6 +41,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
+ <version>${sdo.version}</version>
</dependency>
<!-- dependencies for optional StAX functions -->
@@ -56,6 +57,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sdo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/plugin/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/plugin/pom.xml (original)
+++ incubator/tuscany/java/sdo/plugin/pom.xml Tue Sep 25 16:43:41 2007
@@ -35,6 +35,11 @@
<version>2.0.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.4</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
@@ -47,10 +52,17 @@
<version>2.0.4</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-tools</artifactId>
- <version>${pom.version}</version>
+ <version>${sdo.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Tue Sep 25 16:43:41 2007
@@ -174,7 +174,6 @@
</build>
- <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
@@ -189,5 +188,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- </dependencyManagement>
</project>
Modified: incubator/tuscany/java/sdo/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/sample/pom.xml (original)
+++ incubator/tuscany/java/sdo/sample/pom.xml Tue Sep 25 16:43:41 2007
@@ -35,15 +35,23 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
+ <version>${sdo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${pom.version}</version>
+ <version>${sdo.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-lib</artifactId>
+ <version>${sdo.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/pom.xml?rev=579414&r1=579413&r2=579414&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Tue Sep 25 16:43:41 2007
@@ -32,19 +32,33 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-lib</artifactId>
- <version>${pom.version}</version>
+ <version>${sdo.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${pom.version}</version>
+ <version>${sdo.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
+ <artifactId>common</artifactId>
+ <version>${emfVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>ecore</artifactId>
+ <version>${emfVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
<version>${emfVersion}</version>
<scope>compile</scope>
@@ -58,8 +72,16 @@
</dependency>
<dependency>
+ <groupId>org.eclipse.xsd</groupId>
+ <artifactId>xsd</artifactId>
+ <version>${emfVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
<!-- this is needed because test program calls XMLHelper.save() and SDOXMLResourceImpl (in the sdo/impl project) uses StAX ??? -->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org