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/02/20 08:45:48 UTC

svn commit: r1570097 - in /syncope/trunk: ./ pom.xml

Author: ilgrosso
Date: Thu Feb 20 07:45:47 2014
New Revision: 1570097

URL: http://svn.apache.org/r1570097
Log:
[SYNCOPE-478] Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1569276-1570096

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1570097&r1=1570096&r2=1570097&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Feb 20 07:45:47 2014
@@ -317,7 +317,7 @@ under the License.
     <aspectj.version>1.7.4</aspectj.version>
 
     <cxf.version>3.0.0-milestone2</cxf.version>	
-    <spring.version>3.2.7.RELEASE</spring.version>
+    <spring.version>3.2.8.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>
@@ -330,7 +330,7 @@ under the License.
 
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>6.14.0-SNAPSHOT</wicket.version>
+    <wicket.version>6.14.0</wicket.version>
 
     <groovy.version>2.2.1</groovy.version>
 
@@ -345,7 +345,7 @@ under the License.
 
     <apacheds.version>1.5.7</apacheds.version>
 
-    <tomcat.version>7.0.50</tomcat.version>
+    <tomcat.version>7.0.52</tomcat.version>
 
     <jasypt.version>1.9.1</jasypt.version>