summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/trunk/modules
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 11:00:44 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-25 11:00:44 +0000
commit616f68b270155731e1a830450edff77898706058 (patch)
tree980e2d3a40391d10c65e9a1c80aed79635a412fc /sca-java-1.x/trunk/modules
parent35908eb2a271c31187b04af9623821439634c826 (diff)
Merge r999902 Exclude geronimo-activation_1.1_spec and junit dependencies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027049 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/modules')
-rw-r--r--sca-java-1.x/trunk/modules/binding-ws-axis2/pom.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/sca-java-1.x/trunk/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/trunk/modules/binding-ws-axis2/pom.xml
index d3e77864ff..800e2fdebf 100644
--- a/sca-java-1.x/trunk/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/trunk/modules/binding-ws-axis2/pom.xml
@@ -118,6 +118,11 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</exclusion>
+ <exclusion>
+ <!-- rampart-core brings in activation-1.1.jar -->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -282,6 +287,10 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>