archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up dependencies on stax-api to make sure that one copy of stax-api.jar is on the classpath. Cleaned up dependencies on pluggable contribution-xyz modules.

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672827 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jsdelfino 2008-06-30 17:27:45 +00:00
parent 79c8907bf3
commit e96c0fb37f
25 changed files with 159 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/sca/itest/contribution-import-export/import-resource/pom.xml
View file

@ -70,6 +70,13 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-resource</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>

11
java/sca/modules/assembly-xml/pom.xml
View file

@ -66,9 +66,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>
@ -76,9 +76,14 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-definitions-xml</artifactId>

6
java/sca/modules/binding-notification/pom.xml
View file

@ -65,6 +65,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>

24
java/sca/modules/contribution-impl/pom.xml
View file

@ -41,29 +41,17 @@
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-java</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-namespace</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-resource</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/contribution-java/pom.xml
View file

@ -46,6 +46,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/contribution-namespace/pom.xml
View file

@ -46,6 +46,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/contribution-osgi/pom.xml
View file

@ -60,6 +60,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/contribution-resource/pom.xml
View file

@ -46,6 +46,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/contribution-updater-impl/pom.xml
View file

@ -94,6 +94,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

7
java/sca/modules/contribution-updater/pom.xml
View file

@ -88,13 +88,6 @@
<artifactId>tuscany-node-api</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>

6
java/sca/modules/contribution-xml/pom.xml
View file

@ -40,6 +40,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

4
java/sca/modules/contribution/pom.xml
View file

@ -42,9 +42,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>

6
java/sca/modules/core-databinding/pom.xml
View file

@ -78,6 +78,12 @@
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
<version>3.2.1</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/core-spi/pom.xml
View file

@ -84,6 +84,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/core/pom.xml
View file

@ -70,6 +70,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

10
java/sca/modules/databinding-axiom/pom.xml
View file

@ -41,9 +41,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>
@ -84,6 +84,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

6
java/sca/modules/databinding-jaxb/pom.xml
View file

@ -57,12 +57,6 @@
<artifactId>jaxb-impl</artifactId>
<version>2.1.7</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

10
java/sca/modules/databinding-job/pom.xml
View file

@ -48,9 +48,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>
@ -97,6 +97,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

10
java/sca/modules/databinding-xstream/pom.xml
View file

@ -41,9 +41,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>
@ -89,6 +89,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

64
java/sca/modules/databinding/pom.xml
View file

@ -34,18 +34,18 @@
<artifactId>tuscany-extensibility</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@ -59,27 +59,33 @@
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0-2</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>

6
java/sca/modules/policy-xml/pom.xml
View file

@ -102,6 +102,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--dependency>

1
java/sca/modules/pom.xml
View file

@ -147,6 +147,7 @@
<module>node2-impl</module>
<module>node2-launcher</module>
<module>node2-launcher-webapp</module>
<module>node-manager</module>
<module>osgi-runtime</module>
<module>policy</module>
<module>policy-xml</module>

6
java/sca/modules/workspace-xml/pom.xml
View file

@ -40,6 +40,12 @@
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

4
java/sca/tools/java2wsdl/pom.xml
View file

@ -48,9 +48,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>

5
java/sca/tools/wsdl2java/pom.xml
View file

@ -65,7 +65,6 @@
<artifactId>jaxb-impl</artifactId>
<version>2.1.7</version>
<scope>runtime</scope>
<!-- Replacing stax 1.0 with stax 1.0.1 -->
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@ -75,9 +74,9 @@
</dependency>
<dependency>
<groupId>stax</groupId>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
<version>1.0-2</version>
</dependency>
<dependency>