You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/03/31 09:27:06 UTC

syncope git commit: Upgrading Jackson

Repository: syncope
Updated Branches:
  refs/heads/master e74e13a79 -> 87fe7329e


Upgrading Jackson


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/87fe7329
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/87fe7329
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/87fe7329

Branch: refs/heads/master
Commit: 87fe7329eef2fc0215a4d168a0364e112fb83e79
Parents: e74e13a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 31 09:27:00 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 31 09:27:00 2015 +0200

----------------------------------------------------------------------
 installer/src/main/resources/izpack/install.xml | 2 +-
 pom.xml                                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/87fe7329/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index 0ea00ab..e2f46a6 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -131,7 +131,7 @@ under the License.
   <jar src="lib/httpclient-@{httpclient.version}.jar"/>
   <jar src="lib/httpmime-@{httpclient.version}.jar"/>
   <jar src="lib/httpcore-4.3.3.jar"/>
-  <jar src="lib/jackson-databind-@{jackson.version}.1.jar"/>
+  <jar src="lib/jackson-databind-@{jackson.version}.jar"/>
   <jar src="lib/jackson-core-@{jackson.version}.jar"/>
   <jar src="lib/jackson-annotations-@{jackson.version}.jar"/>
   

http://git-wip-us.apache.org/repos/asf/syncope/blob/87fe7329/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3cf4453..e8381bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,7 @@ under the License.
 
     <camel.version>2.15.0</camel.version>	
 
-    <jackson.version>2.4.5</jackson.version>
+    <jackson.version>2.5.2</jackson.version>
 
     <spring.version>4.1.6.RELEASE</spring.version>
     <spring-security.version>3.2.7.RELEASE</spring-security.version>
@@ -541,7 +541,7 @@ under the License.
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}.1</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>