[2/3] cxf git commit: Updating BouncyCastle + SLF4J
Updating BouncyCastle + SLF4J # Conflicts: # parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bbd098b6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bbd098b6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bbd098b6 Branch: refs/heads/3.0.x-fixes Commit: bbd098b6ee0a913f648e40f91403868d107d6844 Parents: 83dd3b7 Author: Colm O hEigeartaigh Authored: Wed Jan 27 17:13:37 2016 + Committer: Colm O hEigeartaigh Committed: Wed Jan 27 17:14:58 2016 + -- parent/pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/bbd098b6/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ee9b504..6ea5612 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,7 +79,7 @@ 2.2.7 [2.0,3.0) 1.2.14 -1.53 +1.54 2.2_2 [2.1.3,3.0.0) 1.10 @@ -151,7 +151,11 @@ 1.0 geronimo-servlet_2.5_spec 1.1.2 +<<< HEAD 1.7.9 +=== +1.7.14 +>>> cc2a8d6... Updating BouncyCastle + SLF4J 1.2 3.2.14.RELEASE 3.1.7.RELEASE
cxf git commit: Updating BouncyCastle + SLF4J
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 64fd0cc1b -> cc2a8d6e5 Updating BouncyCastle + SLF4J Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc2a8d6e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc2a8d6e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc2a8d6e Branch: refs/heads/3.1.x-fixes Commit: cc2a8d6e58dc2030f21633395fa0476e562393b1 Parents: 64fd0cc Author: Colm O hEigeartaigh Authored: Wed Jan 27 17:13:37 2016 + Committer: Colm O hEigeartaigh Committed: Wed Jan 27 17:14:41 2016 + -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/cc2a8d6e/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index b3a0a34..b720cf7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -72,7 +72,7 @@ 2.3.5 [2.0,3.0) 1.2.14 -1.53 +1.54 2.2_2 [2.1.3,3.0.0) 1.1.0 @@ -138,7 +138,7 @@ 1.0 geronimo-servlet_2.5_spec 1.1.2 -1.7.12 +1.7.14 1.2 4.1.7.RELEASE 3.2.8.RELEASE
cxf git commit: Updating BouncyCastle + SLF4J
Repository: cxf Updated Branches: refs/heads/master ee76fe358 -> 01c4b68b2 Updating BouncyCastle + SLF4J Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01c4b68b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01c4b68b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01c4b68b Branch: refs/heads/master Commit: 01c4b68b2729c1883ce4ee844475a37ebc876f49 Parents: ee76fe3 Author: Colm O hEigeartaigh Authored: Wed Jan 27 17:13:37 2016 + Committer: Colm O hEigeartaigh Committed: Wed Jan 27 17:13:47 2016 + -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/01c4b68b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 8b734d2..ec60317 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -72,7 +72,7 @@ 2.3.5 [2.0,3.0) 1.2.14 -1.53 +1.54 2.2_2 [2.1.3,3.0.0) 1.1.0 @@ -138,7 +138,7 @@ 1.0 geronimo-servlet_2.5_spec 1.1.2 -1.7.12 +1.7.14 1.2 4.1.7.RELEASE 3.2.8.RELEASE
