Author: coheigea
Date: Mon Aug 27 16:08:47 2012
New Revision: 1377727
URL: http://svn.apache.org/viewvc?rev=1377727&view=rev
Log:
Merged revisions 1377721 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1377721 | coheigea | 2012-08-27 16:55:12 +0100 (Mon, 27 Aug 2012) | 2 lines
Upgraded BouncyCastle version
........
Modified:
cxf/branches/2.6.x-fixes/parent/pom.xml
cxf/branches/2.6.x-fixes/rt/ws/security/pom.xml
cxf/branches/2.6.x-fixes/systests/rs-security/pom.xml
cxf/branches/2.6.x-fixes/systests/ws-security/pom.xml
Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1377727&r1=1377726&r2=1377727&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Aug 27 16:08:47 2012
@@ -1295,8 +1295,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.45</version>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.47</version>
</dependency>
<dependency>
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/pom.xml?rev=1377727&r1=1377726&r2=1377727&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/pom.xml Mon Aug 27 16:08:47 2012
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<scope>provided</scope>
</dependency>
Modified: cxf/branches/2.6.x-fixes/systests/rs-security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/rs-security/pom.xml?rev=1377727&r1=1377726&r2=1377727&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/rs-security/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/rs-security/pom.xml Mon Aug 27 16:08:47
2012
@@ -198,7 +198,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/branches/2.6.x-fixes/systests/ws-security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/pom.xml?rev=1377727&r1=1377726&r2=1377727&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/ws-security/pom.xml Mon Aug 27 16:08:47
2012
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<scope>test</scope>
</dependency>
