Return-Path: <commits-return-43994-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id EBE2B200BE0
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  8 Nov 2016 15:56:33 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id EAA37160AFA; Tue,  8 Nov 2016 14:56:33 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 40D22160B0A
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  8 Nov 2016 15:56:30 +0100 (CET)
Received: (qmail 89382 invoked by uid 500); 8 Nov 2016 14:56:29 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 88582 invoked by uid 99); 8 Nov 2016 14:56:28 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2016 14:56:28 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 77AB7E69B1; Tue,  8 Nov 2016 14:56:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Tue, 08 Nov 2016 14:56:36 -0000
Message-Id: <06418929d55b40eb88d2753c8039058c@git.apache.org>
In-Reply-To: <4968690ac88647caa5b7729ae73d968c@git.apache.org>
References: <4968690ac88647caa5b7729ae73d968c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/14] cxf-fediz git commit: Switching jackson + updating ehcache
archived-at: Tue, 08 Nov 2016 14:56:34 -0000

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">