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 2016/09/13 12:58:48 UTC

[1/2] cxf git commit: Updating BouncyCastle

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 7ae560d9e -> 2624d5dd7


Updating BouncyCastle


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

Branch: refs/heads/3.1.x-fixes
Commit: 462063f48b098e2e1d66d7c5964aecadb066455d
Parents: 7ae560d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Sep 13 13:58:10 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Sep 13 13:58:42 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/462063f4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 64d3045..98a0243 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -72,7 +72,7 @@
         <cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>
         <cxf.atmosphere.version.range>[2.0,2.4)</cxf.atmosphere.version.range>
         <cxf.axiom.version>1.2.14</cxf.axiom.version>
-        <cxf.bcprov.version>1.54</cxf.bcprov.version>
+        <cxf.bcprov.version>1.55</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.classmate.version>1.1.0</cxf.classmate.version>


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

Posted by co...@apache.org.
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/2624d5dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2624d5dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2624d5dd

Branch: refs/heads/3.1.x-fixes
Commit: 2624d5dd7a25e383e4e608447ef35ccc6a5d3c39
Parents: 462063f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Sep 13 13:58:43 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Sep 13 13:58:43 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2624d5dd/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 438dc20..25f0698 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -151,6 +151,7 @@ M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
 M e92e57c1f14de911cd2315a907443c79e91a94de
 M ed9298066428c0dfc4590a556876d696a4ba13c0
 M f462c797eab75e9b6c6c352b4baeb84429866068
+M f7f017f2187d59369a7b94bb053f1e297972dce7
 M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
 M fa973bd7ab43099151f83beea351b80c7140eaab
 M fd6689948bc7ad153ccfd7f64554eafbf64b20d6