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 2013/05/10 14:55:15 UTC

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

Author: ilgrosso
Date: Fri May 10 12:55:14 2013
New Revision: 1481000

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

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

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1479794-1480996
  Merged /syncope/branches/1_1_X:r1480576-1480999

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1481000&r1=1480999&r2=1481000&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri May 10 12:55:14 2013
@@ -325,7 +325,7 @@ under the License.
 
     <apacheds.version>1.5.7</apacheds.version>
 
-    <tomcat.version>7.0.39</tomcat.version>
+    <tomcat.version>7.0.40</tomcat.version>
 
     <jasypt.version>1.9.0</jasypt.version>