diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-30 17:27:45 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-30 17:27:45 +0000 |
| commit | e96c0fb37fb981ab792616513a9e4833c3758396 (patch) | |
| tree | 140ae328aee068cf730430b91dd0bdbccc20f1f9 /java | |
| parent | 79c8907bf3b86c58ee515a355361a2f42ebc4776 (diff) | |
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.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672827 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
25 files changed, 159 insertions, 76 deletions
diff --git a/java/sca/itest/contribution-import-export/import-resource/pom.xml b/java/sca/itest/contribution-import-export/import-resource/pom.xml index a12914977c..d3ea4f42dd 100644 --- a/java/sca/itest/contribution-import-export/import-resource/pom.xml +++ b/java/sca/itest/contribution-import-export/import-resource/pom.xml @@ -71,6 +71,13 @@ </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> <version>2.5</version> diff --git a/java/sca/modules/assembly-xml/pom.xml b/java/sca/modules/assembly-xml/pom.xml index ff29f77357..cd439d3216 100644 --- a/java/sca/modules/assembly-xml/pom.xml +++ b/java/sca/modules/assembly-xml/pom.xml @@ -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> diff --git a/java/sca/modules/binding-notification/pom.xml b/java/sca/modules/binding-notification/pom.xml index 84bf115469..43ae0a2552 100644 --- a/java/sca/modules/binding-notification/pom.xml +++ b/java/sca/modules/binding-notification/pom.xml @@ -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>
diff --git a/java/sca/modules/contribution-impl/pom.xml b/java/sca/modules/contribution-impl/pom.xml index a179fb1020..ff83cff49c 100644 --- a/java/sca/modules/contribution-impl/pom.xml +++ b/java/sca/modules/contribution-impl/pom.xml @@ -42,28 +42,16 @@ </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> diff --git a/java/sca/modules/contribution-java/pom.xml b/java/sca/modules/contribution-java/pom.xml index aeea2dcb47..153a4f7c5e 100644 --- a/java/sca/modules/contribution-java/pom.xml +++ b/java/sca/modules/contribution-java/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-namespace/pom.xml b/java/sca/modules/contribution-namespace/pom.xml index 5ee0d5ae12..39e011dbe2 100644 --- a/java/sca/modules/contribution-namespace/pom.xml +++ b/java/sca/modules/contribution-namespace/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml index 2005e1580a..7f5859cad4 100644 --- a/java/sca/modules/contribution-osgi/pom.xml +++ b/java/sca/modules/contribution-osgi/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-resource/pom.xml b/java/sca/modules/contribution-resource/pom.xml index 6dd4e6d15b..da19a5249c 100644 --- a/java/sca/modules/contribution-resource/pom.xml +++ b/java/sca/modules/contribution-resource/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-updater-impl/pom.xml b/java/sca/modules/contribution-updater-impl/pom.xml index 5bf4b355c6..cd4f1e17ee 100644 --- a/java/sca/modules/contribution-updater-impl/pom.xml +++ b/java/sca/modules/contribution-updater-impl/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-updater/pom.xml b/java/sca/modules/contribution-updater/pom.xml index eea8ee8d88..26dc2152a2 100644 --- a/java/sca/modules/contribution-updater/pom.xml +++ b/java/sca/modules/contribution-updater/pom.xml @@ -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> diff --git a/java/sca/modules/contribution-xml/pom.xml b/java/sca/modules/contribution-xml/pom.xml index 2785646d4f..b1a06c2d11 100644 --- a/java/sca/modules/contribution-xml/pom.xml +++ b/java/sca/modules/contribution-xml/pom.xml @@ -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> diff --git a/java/sca/modules/contribution/pom.xml b/java/sca/modules/contribution/pom.xml index 7a274bc919..aae9d73ac0 100644 --- a/java/sca/modules/contribution/pom.xml +++ b/java/sca/modules/contribution/pom.xml @@ -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> diff --git a/java/sca/modules/core-databinding/pom.xml b/java/sca/modules/core-databinding/pom.xml index 5d69791f30..cb88bcd176 100644 --- a/java/sca/modules/core-databinding/pom.xml +++ b/java/sca/modules/core-databinding/pom.xml @@ -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> diff --git a/java/sca/modules/core-spi/pom.xml b/java/sca/modules/core-spi/pom.xml index 347262222b..6246686d08 100644 --- a/java/sca/modules/core-spi/pom.xml +++ b/java/sca/modules/core-spi/pom.xml @@ -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> diff --git a/java/sca/modules/core/pom.xml b/java/sca/modules/core/pom.xml index f33fb9dd94..b71f001d06 100644 --- a/java/sca/modules/core/pom.xml +++ b/java/sca/modules/core/pom.xml @@ -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> diff --git a/java/sca/modules/databinding-axiom/pom.xml b/java/sca/modules/databinding-axiom/pom.xml index d9ccbaf92a..dc8e0b6dce 100644 --- a/java/sca/modules/databinding-axiom/pom.xml +++ b/java/sca/modules/databinding-axiom/pom.xml @@ -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> diff --git a/java/sca/modules/databinding-jaxb/pom.xml b/java/sca/modules/databinding-jaxb/pom.xml index e2933b5242..8392acbd24 100644 --- a/java/sca/modules/databinding-jaxb/pom.xml +++ b/java/sca/modules/databinding-jaxb/pom.xml @@ -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> diff --git a/java/sca/modules/databinding-job/pom.xml b/java/sca/modules/databinding-job/pom.xml index 9f8601f0a9..fa16671342 100644 --- a/java/sca/modules/databinding-job/pom.xml +++ b/java/sca/modules/databinding-job/pom.xml @@ -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> diff --git a/java/sca/modules/databinding-xstream/pom.xml b/java/sca/modules/databinding-xstream/pom.xml index d20fca8a3c..34faa5c8bb 100644 --- a/java/sca/modules/databinding-xstream/pom.xml +++ b/java/sca/modules/databinding-xstream/pom.xml @@ -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> diff --git a/java/sca/modules/databinding/pom.xml b/java/sca/modules/databinding/pom.xml index 8de26313eb..890abcc2ea 100644 --- a/java/sca/modules/databinding/pom.xml +++ b/java/sca/modules/databinding/pom.xml @@ -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> diff --git a/java/sca/modules/policy-xml/pom.xml b/java/sca/modules/policy-xml/pom.xml index 6330f86339..b09443b018 100644 --- a/java/sca/modules/policy-xml/pom.xml +++ b/java/sca/modules/policy-xml/pom.xml @@ -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>
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index d4dbd7fe46..932d184bd3 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -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> diff --git a/java/sca/modules/workspace-xml/pom.xml b/java/sca/modules/workspace-xml/pom.xml index 4f8b0b208f..21024de0d3 100644 --- a/java/sca/modules/workspace-xml/pom.xml +++ b/java/sca/modules/workspace-xml/pom.xml @@ -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> diff --git a/java/sca/tools/java2wsdl/pom.xml b/java/sca/tools/java2wsdl/pom.xml index 96f78194ea..e470860b98 100644 --- a/java/sca/tools/java2wsdl/pom.xml +++ b/java/sca/tools/java2wsdl/pom.xml @@ -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> diff --git a/java/sca/tools/wsdl2java/pom.xml b/java/sca/tools/wsdl2java/pom.xml index 7162915bdc..f644007149 100644 --- a/java/sca/tools/wsdl2java/pom.xml +++ b/java/sca/tools/wsdl2java/pom.xml @@ -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> |