You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/03/10 15:25:32 UTC

[1/2] cxf git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 38eb75ae4 -> 24d88dc5e


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24d88dc5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24d88dc5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24d88dc5

Branch: refs/heads/3.0.x-fixes
Commit: 24d88dc5ecea8053c86c56caa1e3879b917885f5
Parents: 2c642fe
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 10 14:25:27 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Mar 10 14:25:27 2015 +0000

----------------------------------------------------------------------
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/24d88dc5/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index aee4b4e..9a7f1e8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -250,6 +250,7 @@ M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
 M 98a578dbf4b7e19c4555bd2011f24c650d0f54c0
 M 98f65f2911e063e70e864e7614b062cc124a0f9d
 M 990f4b1d594c8f1446d42a516eaef82020df2747
+M 9d25f9a0617bcb30e19d23fa4d5b4bd7948b8434
 M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7
 M a64ded455c40169665e438ae7a25f17bd4f8047a
 M a9555675b829acdfb1672bc2157d6f3c08fdd652


[2/2] cxf git commit: Upgrading BouncyCastle

Posted by co...@apache.org.
Upgrading BouncyCastle


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2c642fe7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2c642fe7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2c642fe7

Branch: refs/heads/3.0.x-fixes
Commit: 2c642fe79342b79e4ca222c1468c5c27f479d146
Parents: 38eb75a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 10 14:25:01 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Mar 10 14:25:27 2015 +0000

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2c642fe7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 826a10b..e899d43 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -79,7 +79,7 @@
         <cxf.atmosphere.version>2.2.4</cxf.atmosphere.version>
         <cxf.atmosphere.version.range>[2.0,3.0)</cxf.atmosphere.version.range>
         <cxf.axiom.version>1.2.14</cxf.axiom.version>
-        <cxf.bcprov.version>1.51</cxf.bcprov.version>
+        <cxf.bcprov.version>1.52</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.10</cxf.commons-codec.version>