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/sca-java-1.3.1/tools | |
| 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 'branches/sca-java-1.3.1/tools')
| -rw-r--r-- | branches/sca-java-1.3.1/tools/java2wsdl/pom.xml | 10 | ||||
| -rw-r--r-- | branches/sca-java-1.3.1/tools/wsdl2java/pom.xml | 11 |
2 files changed, 8 insertions, 13 deletions
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> |