Author: ilgrosso
Date: Mon Apr 7 07:17:08 2014
New Revision: 1585414
URL: http://svn.apache.org/r1585414
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1585013-1585413
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1585414&r1=1585413&r2=1585414&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Apr 7 07:17:08 2014
@@ -1094,7 +1094,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.7</version>
+ <version>1.4.8</version>
<configuration>
<container>
<containerId>tomcat7x</containerId>
