cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1377732 - in /cxf/branches/2.4.x-fixes: parent/pom.xml rt/ws/security/pom.xml systests/ws-security/pom.xml
Date Mon, 27 Aug 2012 16:13:42 GMT
Author: coheigea
Date: Mon Aug 27 16:13:42 2012
New Revision: 1377732

URL: http://svn.apache.org/viewvc?rev=1377732&view=rev
Log:
Merged revisions 1377727 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1377727 | coheigea | 2012-08-27 17:08:47 +0100 (Mon, 27 Aug 2012) | 10 lines

  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

  ........

........


Conflicts:

	systests/rs-security/pom.xml

Modified:
    cxf/branches/2.4.x-fixes/parent/pom.xml
    cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1377732&r1=1377731&r2=1377732&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Mon Aug 27 16:13:42 2012
@@ -1190,8 +1190,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.4.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml?rev=1377732&r1=1377731&r2=1377732&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml Mon Aug 27 16:13:42 2012
@@ -111,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml?rev=1377732&r1=1377731&r2=1377732&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml Mon Aug 27 16:13:42 2012
@@ -188,7 +188,7 @@
         
         <dependency>
              <groupId>org.bouncycastle</groupId>
-             <artifactId>bcprov-jdk15</artifactId>
+             <artifactId>bcprov-jdk15on</artifactId>
              <scope>test</scope>
         </dependency>
         <dependency>



Mime
View raw message