summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3.1/modules/implementation-script
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-08-18 09:33:37 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-08-18 09:33:37 +0000
commit4099431f74be628966e639ddd1f857e4f73caba4 (patch)
tree0e28e7b642a710d3d1462a8553ddac2c4e2c2ba4 /branches/sca-java-1.3.1/modules/implementation-script
parent3df4c3fd37f15f75805a15c0b74f9e4c9e87b811 (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/implementation-script')
-rw-r--r--branches/sca-java-1.3.1/modules/implementation-script/pom.xml4
1 files changed, 4 insertions, 0 deletions
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>