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/01/13 09:27:55 UTC

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

Author: ilgrosso
Date: Mon Jan 13 08:27:54 2014
New Revision: 1557660

URL: http://svn.apache.org/r1557660
Log:
Merge from 1_1_X

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

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1556849-1557659

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1557660&r1=1557659&r2=1557660&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Jan 13 08:27:54 2014
@@ -340,7 +340,7 @@ under the License.
 
     <apacheds.version>1.5.7</apacheds.version>
 
-    <tomcat.version>7.0.47</tomcat.version>
+    <tomcat.version>7.0.50</tomcat.version>
 
     <jasypt.version>1.9.1</jasypt.version>