diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-18 09:33:37 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-18 09:33:37 +0000 |
commit | 4099431f74be628966e639ddd1f857e4f73caba4 (patch) | |
tree | 0e28e7b642a710d3d1462a8553ddac2c4e2c2ba4 /branches | |
parent | 3df4c3fd37f15f75805a15c0b74f9e4c9e87b811 (diff) |
Merge fixes from trunk to 1.3.1 branch for TUSCANY-2534: WebSphere issue java.lang.ClassCastException: org.apache.xerces.jaxp.DocumentBuilderFactoryImpl incompatible with javax.xml.parsers.DocumentBuilderFactory
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686710 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
11 files changed, 177 insertions, 64 deletions
diff --git a/branches/sca-java-1.3.1/itest/builder/pom.xml b/branches/sca-java-1.3.1/itest/builder/pom.xml index 429d5ffc91..5bf74e2291 100644 --- a/branches/sca-java-1.3.1/itest/builder/pom.xml +++ b/branches/sca-java-1.3.1/itest/builder/pom.xml @@ -83,6 +83,13 @@ <version>1.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesimpl</artifactId>
+ <version>2.8.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/branches/sca-java-1.3.1/modules/binding-ws-axis2/pom.xml b/branches/sca-java-1.3.1/modules/binding-ws-axis2/pom.xml index c38222a456..30c8ba0808 100644 --- a/branches/sca-java-1.3.1/modules/binding-ws-axis2/pom.xml +++ b/branches/sca-java-1.3.1/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> @@ -149,6 +179,20 @@ <artifactId>axis2-codegen</artifactId> <version>1.3</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <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> <dependency> @@ -159,21 +203,28 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> + <exclusion> + <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> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -280,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> @@ -289,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> @@ -332,7 +394,22 @@ <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> </exclusion> - + <exclusion> + <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> @@ -361,12 +438,29 @@ <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> <!-- Exclude XmlSchema 1.3.1 --> <exclusion> <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> @@ -403,11 +497,29 @@ <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + + <!-- Exclude XmlSchema 1.3.1 --> <exclusion> <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/branches/sca-java-1.3.1/modules/contribution/pom.xml b/branches/sca-java-1.3.1/modules/contribution/pom.xml index 22ffe3dd96..34cd808b15 100644 --- a/branches/sca-java-1.3.1/modules/contribution/pom.xml +++ b/branches/sca-java-1.3.1/modules/contribution/pom.xml @@ -46,11 +46,6 @@ <artifactId>stax-api</artifactId> <version>1.0.1</version> </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.3.03</version> - </dependency> </dependencies> <build> diff --git a/branches/sca-java-1.3.1/modules/databinding-axiom/pom.xml b/branches/sca-java-1.3.1/modules/databinding-axiom/pom.xml index 8410deb48f..f43f0d449b 100644 --- a/branches/sca-java-1.3.1/modules/databinding-axiom/pom.xml +++ b/branches/sca-java-1.3.1/modules/databinding-axiom/pom.xml @@ -55,17 +55,14 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</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/branches/sca-java-1.3.1/modules/databinding-jaxb-axiom/pom.xml b/branches/sca-java-1.3.1/modules/databinding-jaxb-axiom/pom.xml index fa0a3d6721..0c4f7c1de1 100644 --- a/branches/sca-java-1.3.1/modules/databinding-jaxb-axiom/pom.xml +++ b/branches/sca-java-1.3.1/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/branches/sca-java-1.3.1/modules/databinding-sdo-axiom/pom.xml b/branches/sca-java-1.3.1/modules/databinding-sdo-axiom/pom.xml index bc1dfa9570..835ed23007 100644 --- a/branches/sca-java-1.3.1/modules/databinding-sdo-axiom/pom.xml +++ b/branches/sca-java-1.3.1/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/branches/sca-java-1.3.1/modules/implementation-script/pom.xml b/branches/sca-java-1.3.1/modules/implementation-script/pom.xml index 34aef3196a..65a383d30d 100644 --- a/branches/sca-java-1.3.1/modules/implementation-script/pom.xml +++ b/branches/sca-java-1.3.1/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/branches/sca-java-1.3.1/modules/policy-security-ws/pom.xml b/branches/sca-java-1.3.1/modules/policy-security-ws/pom.xml index 79e3b59d3c..e5360a0bf6 100644 --- a/branches/sca-java-1.3.1/modules/policy-security-ws/pom.xml +++ b/branches/sca-java-1.3.1/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>
@@ -90,6 +87,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/branches/sca-java-1.3.1/modules/policy-xml-ws/pom.xml b/branches/sca-java-1.3.1/modules/policy-xml-ws/pom.xml index a79cf62430..b46490f171 100644 --- a/branches/sca-java-1.3.1/modules/policy-xml-ws/pom.xml +++ b/branches/sca-java-1.3.1/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> diff --git a/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml b/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml index aeccffe317..b10f64947a 100644 --- a/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml +++ b/branches/sca-java-1.3.1/tools/java2wsdl/pom.xml @@ -89,17 +89,15 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</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> - </dependency> - - <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> <version>1.2.5</version> diff --git a/branches/sca-java-1.3.1/tools/wsdl2java/pom.xml b/branches/sca-java-1.3.1/tools/wsdl2java/pom.xml index 4b39dcc95b..dcccb34e72 100644 --- a/branches/sca-java-1.3.1/tools/wsdl2java/pom.xml +++ b/branches/sca-java-1.3.1/tools/wsdl2java/pom.xml @@ -116,18 +116,15 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</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> |