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/07/08 14:52:57 UTC

svn commit: r1500702 - in /syncope/branches/1_1_X: ./ pom.xml

Author: ilgrosso
Date: Mon Jul  8 12:52:57 2013
New Revision: 1500702

URL: http://svn.apache.org/r1500702
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:r1497697-1500694

Modified: syncope/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1500702&r1=1500701&r2=1500702&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Mon Jul  8 12:52:57 2013
@@ -325,7 +325,7 @@ under the License.
 
     <apacheds.version>1.5.7</apacheds.version>
 
-    <tomcat.version>7.0.41</tomcat.version>
+    <tomcat.version>7.0.42</tomcat.version>
 
     <jasypt.version>1.9.0</jasypt.version>
  
@@ -911,7 +911,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.14.1</version>
+          <version>2.15</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <encoding>utf-8</encoding>
@@ -964,7 +964,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.14.1</version>
+          <version>2.15</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <encoding>utf-8</encoding>