syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [3/4] syncope git commit: Upgrading Jackson (this time for real)
Date Mon, 27 Apr 2015 07:11:45 GMT
Upgrading Jackson (this time for real)


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

Branch: refs/heads/1_2_X
Commit: 6d658572c0724df3db62197c1d1858a20e028669
Parents: a43b36d
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Apr 27 08:57:23 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Apr 27 08:57:23 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/6d658572/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 fcd568b..c7795f8 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -132,7 +132,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/6d658572/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b771181..d6cc244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -346,7 +346,7 @@ under the License.
     <cxf.version>3.0.4</cxf.version>	
     <spring.version>4.0.9.RELEASE</spring.version>
     <spring-security.version>3.2.7.RELEASE</spring-security.version>
-    <jackson.version>2.4.5</jackson.version>
+    <jackson.version>2.4.6</jackson.version>
     <velocity.version>1.7</velocity.version>
     <velocitytools.version>2.0</velocitytools.version>
     <quartz.version>2.2.1</quartz.version>
@@ -732,7 +732,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>


Mime
View raw message