cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [09/14] cxf-fediz git commit: Switching jackson + updating ehcache
Date Tue, 08 Nov 2016 14:56:36 GMT
Switching jackson + updating ehcache


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

Branch: refs/heads/1.3.x-fixes
Commit: ff78d7b39b6c5b1dafd1827f30f0524df18f3fe8
Parents: e79c279
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Oct 18 14:50:40 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Nov 8 14:46:51 2016 +0000

----------------------------------------------------------------------
 pom.xml                                         |  2 +-
 services/idp/pom.xml                            | 11 +++--------
 services/idp/src/main/resources/restContext.xml |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0320c2..176e432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <cxf.build-utils.version>3.2.0</cxf.build-utils.version>
         <easymock.version>3.4</easymock.version>
         <ecj.version>4.6.1</ecj.version>
-        <ehcache.version>2.9.0</ehcache.version>
+        <ehcache.version>2.10.3</ehcache.version>
         <httpclient.version>4.3.5</httpclient.version>
         <hsqldb.version>2.3.4</hsqldb.version>
         <htmlunit.version>2.23</htmlunit.version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index e3ce225..6edde85 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -196,14 +196,9 @@
             <version>${cxf.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.13</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-xc</artifactId>
-            <version>1.9.13</version>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>2.7.8</version>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 1d6f446..ba22cd3 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -53,7 +53,7 @@
     <bean id="exceptionMapper"
         class="org.apache.cxf.fediz.service.idp.rest.RestServiceExceptionMapper" />
 
-    <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider"
/>
+    <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider"
/>
     
     <!-- CXF Swagger2Feature -->
     <bean id="swagger2Serializers" class="org.apache.cxf.jaxrs.swagger.DefaultSwagger2Serializers">


Mime
View raw message