cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1547858 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date Wed, 04 Dec 2013 17:50:49 GMT
Author: coheigea
Date: Wed Dec  4 17:50:48 2013
New Revision: 1547858

URL: http://svn.apache.org/r1547858
Log:
Merged revisions 1547856 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1547856 | coheigea | 2013-12-04 17:49:21 +0000 (Wed, 04 Dec 2013) | 7 lines

  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.6.x-fixes/parent/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=1547858&r1=1547857&r2=1547858&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Wed Dec  4 17:50:48 2013
@@ -87,7 +87,7 @@
              need the 5.5.0 features.xml. :-(  -->
         <cxf.activemq.version>5.4.2</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.6</cxf.commons-codec.version>



Mime
View raw message