summaryrefslogtreecommitdiffstats
path: root/java/sca/distribution/bundle
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-30 17:31:21 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-07-30 17:31:21 +0000
commit5b25a38af216bbf60a0804068678849dca338ff7 (patch)
treeb2ff328ad66ff291bc502fd3f31867554618d8a8 /java/sca/distribution/bundle
parent1fe194e5cfe9606af6710c146aaca564f8f41354 (diff)
Merge the fix from 1.3 branch for TUSCANY-2509, TUSCANY-2506
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/bundle')
-rw-r--r--java/sca/distribution/bundle/pom.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/sca/distribution/bundle/pom.xml b/java/sca/distribution/bundle/pom.xml
index 3d4ea7ff92..9a72908c41 100644
--- a/java/sca/distribution/bundle/pom.xml
+++ b/java/sca/distribution/bundle/pom.xml
@@ -459,6 +459,15 @@
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-wsdl2java</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+
+ </exclusions>
</dependency>
<!-- dependencies to keep in the shaded pom.xml -->