Author: coheigea
Date: Wed Dec 4 17:49:21 2013
New Revision: 1547856
URL: http://svn.apache.org/r1547856
Log:
Upgrading to BouncyCastle 1.50
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
Modified:
cxf/branches/2.7.x-fixes/parent/pom.xml
Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1547856&r1=1547855&r2=1547856&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Wed Dec 4 17:49:21 2013
@@ -85,7 +85,7 @@
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.activemq.version>5.8.0</cxf.activemq.version>
<cxf.axiom.version>1.2.14</cxf.axiom.version>
- <cxf.bcprov.version>1.49</cxf.bcprov.version>
+ <cxf.bcprov.version>1.50</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
<cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
<cxf.commons-codec.version>1.8</cxf.commons-codec.version>
