You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/01/13 15:57:19 UTC
cxf git commit: [CXF-6746] Updating Jackson version to 2.6.4
Repository: cxf
Updated Branches:
refs/heads/master cf96f7913 -> 8f98be8e7
[CXF-6746] Updating Jackson version to 2.6.4
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8f98be8e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f98be8e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f98be8e
Branch: refs/heads/master
Commit: 8f98be8e72d4dbe18347a7efab91f4b008d8385f
Parents: cf96f79
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Jan 13 14:56:43 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Jan 13 14:56:43 2016 +0000
----------------------------------------------------------------------
parent/pom.xml | 7 ++++++-
systests/jaxrs/pom.xml | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f98be8e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b92e77e..8b734d2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.httpcomponents.client.version>4.5.1</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version>4.4.1</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.jackson.version>2.4.6</cxf.jackson.version>
+ <cxf.jackson.version>2.6.4</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>
@@ -1414,6 +1414,11 @@
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${cxf.jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>${cxf.asm.groupId}</groupId>
<artifactId>${cxf.asm.artifactId}</artifactId>
<version>${cxf.asm.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f98be8e/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 653db0a..39a3cfb 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -458,6 +458,10 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>test</scope>