cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1493126 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date Fri, 14 Jun 2013 15:46:17 GMT
Author: coheigea
Date: Fri Jun 14 15:46:16 2013
New Revision: 1493126

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

........
  r1493112 | coheigea | 2013-06-14 16:23:17 +0100 (Fri, 14 Jun 2013) | 10 lines

  Merged revisions 1492679 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1492679 | coheigea | 2013-06-13 15:00:23 +0100 (Thu, 13 Jun 2013) | 2 lines

    Upgrading BouncyCastle version

  ........

........

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=1493126&r1=1493125&r2=1493126&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Fri Jun 14 15:46:16 2013
@@ -87,6 +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.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>
@@ -1280,7 +1281,7 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.47</version>
+                <version>${cxf.bcprov.version}</version>
             </dependency>
 
             <dependency>



Mime
View raw message