Author: jboynes
Date: Fri Jul 28 19:27:14 2006
New Revision: 426745
URL: http://svn.apache.org/viewvc?rev=426745&view=rev
Log:
prevent dependency scope conflict warning during build
general cleanup of the dependencies
Modified:
incubator/tuscany/java/sdo/impl/pom.xml
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?rev=426745&r1=426744&r2=426745&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Fri Jul 28 19:27:14 2006
@@ -34,30 +34,6 @@
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <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>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>2.9.3</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
<version>${emfVersion}</version>
@@ -88,37 +64,63 @@
<scope>compile</scope>
</dependency>
+ <!-- dependencies for optional code generation functions -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- dependencies for optional StAX functions -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
+ <!-- dependencies for optional AXIOM functions -->
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>1.0.2</version>
- <scope>compile</scope>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-api</artifactId>
<version>1.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-impl</artifactId>
<version>1.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <scope>compile</scope>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.9.3</version>
+ <scope>test</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
