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/09/08 09:47:00 UTC
svn commit: r1623313 - in /syncope/trunk: ./ pom.xml
Author: ilgrosso
Date: Mon Sep 8 07:47:00 2014
New Revision: 1623313
URL: http://svn.apache.org/r1623313
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1622641-1623312
Merged /syncope/branches/1_1_X:r1622637-1623310
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1623313&r1=1623312&r2=1623313&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep 8 07:47:00 2014
@@ -326,7 +326,7 @@ under the License.
<aspectj.version>1.8.2</aspectj.version>
<cxf.version>3.0.1</cxf.version>
- <spring.version>4.0.6.RELEASE</spring.version>
+ <spring.version>4.0.7.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<jackson.version>2.4.2</jackson.version>
<velocity.version>1.7</velocity.version>
@@ -340,7 +340,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.16.0</wicket.version>
+ <wicket.version>6.17.0</wicket.version>
<groovy.version>2.3.6</groovy.version>