Author: nash
Date: Tue Aug 24 19:42:20 2010
New Revision: 988687
URL: http://svn.apache.org/viewvc?rev=988687&view=rev
Log:
Merge revision 942469 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml?rev=988687&r1=988686&r2=988687&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-axis2/pom.xml
Tue Aug 24 19:42:20 2010
@@ -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>
