Author: veithen
Date: Tue Jul 15 19:16:28 2014
New Revision: 1610817
URL: http://svn.apache.org/r1610817
Log:
RAMPART-415: Applied Detelin Yordanov's patch to update Bouncy Castle to 1.49.
Modified:
axis/axis2/java/rampart/trunk/build.xml
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/build.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/build.xml (original)
+++ axis/axis2/java/rampart/trunk/build.xml Tue Jul 15 19:16:28 2014
@@ -106,7 +106,7 @@
</target>
<target name="copy-bc-jar-15" unless="${jdk14.present}">
- <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/bouncycastle/bcprov-jdk15/${version.bcprov15}/bcprov-jdk15-${version.bcprov15}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/org/bouncycastle/bcprov-jdk15on/${version.bcprov15}/bcprov-jdk15on-${version.bcprov15}.jar"/>
</target>
<target name="src-dist" depends="init">
Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Tue Jul 15
19:16:28 2014
@@ -17,7 +17,7 @@
<includes>
<include>org.apache.santuario:xmlsec:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
- <include>bouncycastle:bcprov-jdk15:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
<include>org.apache.rampart:rampart-core:jar</include>
<include>org.apache.rampart:rampart-policy:jar</include>
<include>org.apache.rampart:rampart-trust:jar</include>
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Tue Jul 15
19:16:28 2014
@@ -112,8 +112,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Tue Jul 15
19:16:28 2014
@@ -72,8 +72,8 @@
<artifactId>wss4j</artifactId>
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml Tue Jul 15
19:16:28 2014
@@ -77,8 +77,8 @@
<artifactId>wss4j</artifactId>
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1610817&r1=1610816&r2=1610817&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Jul 15 19:16:28 2014
@@ -377,8 +377,8 @@
<version>${wss4j.version}</version>
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
<dependency>
@@ -532,7 +532,7 @@
<wss4j.version>1.6.16</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
- <bcprov.jdk15.version>140</bcprov.jdk15.version>
+ <bcprov.jdk15.version>1.49</bcprov.jdk15.version>
<!-- distribution properties -->
<dist.dir>rampart-${project.version}</dist.dir>
