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 2014/08/18 16:19:41 UTC

svn commit: r1618614 - in /syncope/branches/1_2_X: installer/src/main/resources/izpack/install.xml pom.xml

Author: ilgrosso
Date: Mon Aug 18 14:19:41 2014
New Revision: 1618614

URL: http://svn.apache.org/r1618614
Log:
Dependency upgrades

Modified:
    syncope/branches/1_2_X/installer/src/main/resources/izpack/install.xml
    syncope/branches/1_2_X/pom.xml

Modified: syncope/branches/1_2_X/installer/src/main/resources/izpack/install.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/resources/izpack/install.xml?rev=1618614&r1=1618613&r2=1618614&view=diff
==============================================================================
--- syncope/branches/1_2_X/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/branches/1_2_X/installer/src/main/resources/izpack/install.xml Mon Aug 18 14:19:41 2014
@@ -28,9 +28,9 @@ under the License.
     <appversion>@{syncope.version}</appversion>
     <url>http://syncope.apache.org</url>
     <authors>
-      <author name="Tirasa S.r.l." email="info@tirasa.net"/>
+      <author name="Apache Syncope" email="dev@syncope.apache.org"/>
     </authors>
-    <javaversion>1.7</javaversion>
+    <javaversion>${targetJdk}</javaversion>
   </info>
   
   <guiprefs resizable="no" width="800" height="600">
@@ -132,8 +132,8 @@ under the License.
   <jar src="lib/httpclient-@{httpclient.version}.jar"/>
   <jar src="lib/httpmime-@{httpclient.version}.jar"/>
   <jar src="lib/httpcore-4.3.2.jar"/>
-  <jar src="lib/jackson-databind-@{jackson.version}.3.jar"/>
-  <jar src="lib/jackson-core-@{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"/>
   
   <jar src="lib/maven-invoker-@{maven-invoker.version}.jar"/>

Modified: syncope/branches/1_2_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/pom.xml?rev=1618614&r1=1618613&r2=1618614&view=diff
==============================================================================
--- syncope/branches/1_2_X/pom.xml (original)
+++ syncope/branches/1_2_X/pom.xml Mon Aug 18 14:19:41 2014
@@ -321,14 +321,14 @@ under the License.
     <commons-lang.version>3.3.2</commons-lang.version>
     <commons-codec.version>1.9</commons-codec.version>
 
-    <activiti.version>5.16</activiti.version>
+    <activiti.version>5.16.1</activiti.version>
     
-    <aspectj.version>1.8.0</aspectj.version>
+    <aspectj.version>1.8.2</aspectj.version>
 
     <cxf.version>3.0.1</cxf.version>	
     <spring.version>4.0.6.RELEASE</spring.version>
-    <spring-security.version>3.2.4.RELEASE</spring-security.version>
-    <jackson.version>2.4.1</jackson.version>
+    <spring-security.version>3.2.5.RELEASE</spring-security.version>
+    <jackson.version>2.4.2</jackson.version>
     <velocity.version>1.7</velocity.version>
     <velocitytools.version>2.0</velocitytools.version>
     <quartz.version>2.2.1</quartz.version>
@@ -709,12 +709,12 @@ under the License.
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}.1</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}.3</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>