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/01/27 18:15:17 UTC
[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 <co...@apache.org>
Authored: Wed Jan 27 17:13:37 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 27 17:14:58 2016 +0000
----------------------------------------------------------------------
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 @@
<cxf.atmosphere.version>2.2.7</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.53</cxf.bcprov.version>
+ <cxf.bcprov.version>1.54</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>
@@ -151,7 +151,11 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
+<<<<<<< HEAD
<cxf.slf4j.version>1.7.9</cxf.slf4j.version>
+=======
+ <cxf.slf4j.version>1.7.14</cxf.slf4j.version>
+>>>>>>> cc2a8d6... Updating BouncyCastle + SLF4J
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.version>3.2.14.RELEASE</cxf.spring.version>
<cxf.spring.security.version>3.1.7.RELEASE</cxf.spring.security.version>