cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Consolidating Jackson dependencies around version 2.6.5, patch from grgrzybek applied, This closes #118
Date Mon, 07 Mar 2016 12:42:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 7b458be77 -> 48a11ded3


Consolidating Jackson dependencies around version 2.6.5, patch from grgrzybek applied, This
closes #118


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

Branch: refs/heads/3.1.x-fixes
Commit: 48a11ded3b34ff6d923e89c58003eb65dc13a39c
Parents: 7b458be
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Mar 7 10:46:58 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Mar 7 12:42:16 2016 +0000

----------------------------------------------------------------------
 parent/pom.xml                   | 42 ++++++++++++++++++++++++++++++++++-
 systests/cdi/pom.xml             |  1 -
 systests/jibx/jaxrs-jibx/pom.xml |  1 -
 systests/rs-http-sci/pom.xml     |  1 -
 systests/tracing/pom.xml         |  1 -
 5 files changed, 41 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/48a11ded/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 88cd310..56fd166 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.5</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>
@@ -1413,6 +1413,46 @@
                 <version>${cxf.jackson.version}</version>
             </dependency>
             <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${cxf.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <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>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jsonSchema</artifactId>
+                <version>${cxf.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-scala_2.10</artifactId>
+                <version>${cxf.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-xml</artifactId>
+                <version>${cxf.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${cxf.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-joda</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/48a11ded/systests/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 7df1737..f61aa15 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -148,7 +148,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/48a11ded/systests/jibx/jaxrs-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml
index 6242ed7..3df4ac2 100644
--- a/systests/jibx/jaxrs-jibx/pom.xml
+++ b/systests/jibx/jaxrs-jibx/pom.xml
@@ -230,7 +230,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.4.1</version>
         </dependency>
         
     </dependencies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/48a11ded/systests/rs-http-sci/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index c9d2384..e6a4682 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -108,7 +108,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/48a11ded/systests/tracing/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml
index a588a16..6afb667 100644
--- a/systests/tracing/pom.xml
+++ b/systests/tracing/pom.xml
@@ -103,7 +103,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>


Mime
View raw message