Author: ilgrosso
Date: Wed Apr 2 06:38:15 2014
New Revision: 1583898
URL: http://svn.apache.org/r1583898
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1582229-1583896
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1583898&r1=1583897&r2=1583898&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Apr 2 06:38:15 2014
@@ -351,7 +351,7 @@ under the License.
<apacheds.version>1.5.7</apacheds.version>
- <tomcat.version>7.0.52</tomcat.version>
+ <tomcat.version>7.0.53</tomcat.version>
<jasypt.version>1.9.1</jasypt.version>
