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/modules/policy-security-ws | |
| 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/modules/policy-security-ws')
| -rw-r--r-- | branches/sca-java-1.3.1/modules/policy-security-ws/pom.xml | 19 |
1 files changed, 12 insertions, 7 deletions
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>
|