diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-08 14:26:47 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-08 14:26:47 +0000 |
commit | 8eecccbdfd32a794e38ae00f637e34d647d87556 (patch) | |
tree | 97d6b951f78c04f2ea30467bf5a9cfb0532eeb9d /java/sca/modules | |
parent | 14ca923d22e008082a0d97e1c08711e525ce384b (diff) |
Remove dependencies on xml-apis, xercesImpl, and xalan except for the one plave in the axis2 binding that needs xercesImpl when doing ws-sec
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683979 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | java/sca/modules/binding-ws-axis2/pom.xml | 117 | ||||
-rw-r--r-- | java/sca/modules/databinding-axiom/pom.xml | 11 | ||||
-rw-r--r-- | java/sca/modules/databinding-jaxb-axiom/pom.xml | 4 | ||||
-rw-r--r-- | java/sca/modules/databinding-sdo-axiom/pom.xml | 11 | ||||
-rw-r--r-- | java/sca/modules/implementation-script/pom.xml | 4 | ||||
-rw-r--r-- | java/sca/modules/policy-security-ws/pom.xml | 19 | ||||
-rw-r--r-- | java/sca/modules/policy-xml-ws/pom.xml | 11 |
7 files changed, 132 insertions, 45 deletions
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml index 0c942e7786..42c2140511 100644 --- a/java/sca/modules/binding-ws-axis2/pom.xml +++ b/java/sca/modules/binding-ws-axis2/pom.xml @@ -114,6 +114,14 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> </exclusions> </dependency> @@ -134,6 +142,18 @@ <groupId>xom</groupId> <artifactId>xom</artifactId> </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> @@ -142,6 +162,16 @@ <artifactId>axis2-adb</artifactId> <version>1.3</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -154,6 +184,14 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> </exclusions> </dependency> @@ -169,18 +207,15 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> <version>1.2.5</version> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> <version>1.2.5</version> @@ -296,6 +331,16 @@ <groupId>org.apache.axis2</groupId> <artifactId>axis2-mtompolicy</artifactId> <version>1.3</version> + <exclusions> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -305,21 +350,22 @@ </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> - - <dependency> <groupId>org.apache.ws.security</groupId> <artifactId>wss4j</artifactId> <version>1.5.3</version> </dependency> - + <!-- xalan is required by wss4j --> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.3.03</version> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>optional</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -352,6 +398,18 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> </exclusions> </dependency> @@ -390,6 +448,19 @@ <artifactId>XmlSchema</artifactId> </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> @@ -437,6 +508,18 @@ <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/java/sca/modules/databinding-axiom/pom.xml b/java/sca/modules/databinding-axiom/pom.xml index 1cbc5a6c2a..f602ad3519 100644 --- a/java/sca/modules/databinding-axiom/pom.xml +++ b/java/sca/modules/databinding-axiom/pom.xml @@ -59,17 +59,14 @@ <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> <version>1.2.5</version> diff --git a/java/sca/modules/databinding-jaxb-axiom/pom.xml b/java/sca/modules/databinding-jaxb-axiom/pom.xml index d5c9a46aeb..12150abb7e 100644 --- a/java/sca/modules/databinding-jaxb-axiom/pom.xml +++ b/java/sca/modules/databinding-jaxb-axiom/pom.xml @@ -56,6 +56,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/java/sca/modules/databinding-sdo-axiom/pom.xml b/java/sca/modules/databinding-sdo-axiom/pom.xml index 17120d6268..297f77d5ee 100644 --- a/java/sca/modules/databinding-sdo-axiom/pom.xml +++ b/java/sca/modules/databinding-sdo-axiom/pom.xml @@ -58,6 +58,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> @@ -69,13 +73,6 @@ </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> diff --git a/java/sca/modules/implementation-script/pom.xml b/java/sca/modules/implementation-script/pom.xml index c456a87109..194bad0caf 100644 --- a/java/sca/modules/implementation-script/pom.xml +++ b/java/sca/modules/implementation-script/pom.xml @@ -73,6 +73,10 @@ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
<version>1.2.5</version>
</dependency>
diff --git a/java/sca/modules/policy-security-ws/pom.xml b/java/sca/modules/policy-security-ws/pom.xml index 39451178f3..f733f7f4c6 100644 --- a/java/sca/modules/policy-security-ws/pom.xml +++ b/java/sca/modules/policy-security-ws/pom.xml @@ -63,18 +63,15 @@ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
<version>1.2.5</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>1.2.5</version>
@@ -89,6 +86,14 @@ <groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/java/sca/modules/policy-xml-ws/pom.xml b/java/sca/modules/policy-xml-ws/pom.xml index ff89556770..f6d8a884ec 100644 --- a/java/sca/modules/policy-xml-ws/pom.xml +++ b/java/sca/modules/policy-xml-ws/pom.xml @@ -64,17 +64,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> <version>2.0.2</version> |