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:21:29 UTC
svn commit: r1618615 - in /syncope/trunk: ./
installer/src/main/resources/izpack/install.xml pom.xml
Author: ilgrosso
Date: Mon Aug 18 14:21:29 2014
New Revision: 1618615
URL: http://svn.apache.org/r1618615
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/installer/src/main/resources/izpack/install.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1617506-1618614
Modified: syncope/trunk/installer/src/main/resources/izpack/install.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/install.xml?rev=1618615&r1=1618614&r2=1618615&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/trunk/installer/src/main/resources/izpack/install.xml Mon Aug 18 14:21:29 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1618615&r1=1618614&r2=1618615&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Aug 18 14:21:29 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>