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/03/05 08:20:18 UTC
svn commit: r1574387 - in /syncope/trunk: ./ pom.xml
Author: ilgrosso
Date: Wed Mar 5 07:20:18 2014
New Revision: 1574387
URL: http://svn.apache.org/r1574387
Log:
Merge from 1_1_X and Jackson upgrade
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1571988-1574386
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1574387&r1=1574386&r2=1574387&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Mar 5 07:20:18 2014
@@ -319,8 +319,8 @@ under the License.
<cxf.version>3.0.0-milestone2</cxf.version>
<spring.version>4.0.2.RELEASE</spring.version>
<spring-security.version>3.2.0.RELEASE</spring-security.version>
- <jackson.version>2.3.1</jackson.version>
- <xstream.version>1.4.6</xstream.version>
+ <jackson.version>2.3.2</jackson.version>
+ <xstream.version>1.4.7</xstream.version>
<velocity.version>1.7</velocity.version>
<quartz.version>2.2.1</quartz.version>
@@ -332,12 +332,12 @@ under the License.
<wicket.version>6.14.0</wicket.version>
- <groovy.version>2.2.1</groovy.version>
+ <groovy.version>2.2.2</groovy.version>
<h2.version>1.3.175</h2.version>
<log4j.version>2.0-rc1</log4j.version>
- <slf4j.version>1.7.5</slf4j.version>
+ <slf4j.version>1.7.6</slf4j.version>
<disruptor.version>3.2.0</disruptor.version>
<junit.version>4.11</junit.version>