Author: ilgrosso
Date: Wed Jun 12 14:28:28 2013
New Revision: 1492223
URL: http://svn.apache.org/r1492223
Log:
Merge from 1_0_X
Modified:
syncope/branches/1_1_X/ (props changed)
syncope/branches/1_1_X/pom.xml
Propchange: syncope/branches/1_1_X/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1487793-1492222
Modified: syncope/branches/1_1_X/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1492223&r1=1492222&r2=1492223&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Wed Jun 12 14:28:28 2013
@@ -325,7 +325,7 @@ under the License.
<apacheds.version>1.5.7</apacheds.version>
- <tomcat.version>7.0.40</tomcat.version>
+ <tomcat.version>7.0.41</tomcat.version>
<jasypt.version>1.9.0</jasypt.version>
