summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 19:42:20 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 19:42:20 +0000
commit838ec7f9e0d0fbb9b8c4435d25f1111eec0deaf3 (patch)
tree3b84f984f4a24d072a3d71b8c0e4722719f4e9bb
parent1dd5d7fb7e6f91b81cb3c771a5e83be5e1e65e2a (diff)
Merge revision 942469 from trunk into the 1.6.1 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988687 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
index d724515042..d2ac513cf7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
@@ -215,6 +215,10 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -328,6 +332,13 @@
<version>1.6.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>