Updating a few dependencies # 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/bec48272 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bec48272 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bec48272 Branch: refs/heads/3.1.x-fixes Commit: bec482729cf3c0938658cbe2ccb542e1a9ab034d Parents: bca5ead Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Apr 27 14:30:43 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Apr 27 14:36:07 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bec48272/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0bba8d4..817f37b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,7 +91,7 @@ <cxf.httpcomponents.client.version>4.5.2</cxf.httpcomponents.client.version> <cxf.httpcomponents.core.version>4.4.4</cxf.httpcomponents.core.version> <cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range> - <cxf.jackson.version>2.6.5</cxf.jackson.version> + <cxf.jackson.version>2.6.6</cxf.jackson.version> <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version> <cxf.logback.classic.version>1.0.13</cxf.logback.classic.version> <cxf.log4j.version>1.2.17</cxf.log4j.version> @@ -138,7 +138,7 @@ <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> - <cxf.slf4j.version>1.7.19</cxf.slf4j.version> + <cxf.slf4j.version>1.7.21</cxf.slf4j.version> <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version> <cxf.spring.version>4.1.9.RELEASE</cxf.spring.version> <cxf.spring.security.version>3.2.9.RELEASE</cxf.spring.security.version>