Author: ilgrosso
Date: Thu May 30 09:13:27 2013
New Revision: 1487794
URL: http://svn.apache.org/r1487794
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 30 09:13:27 2013
@@ -4,3 +4,4 @@ target
.project
.travis.yml.swp
.CHANGES.swp
+.pom.xml.swp
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1480997-1487792
Merged /syncope/branches/1_1_X:r1487334-1487793
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1487794&r1=1487793&r2=1487794&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu May 30 09:13:27 2013
@@ -1014,7 +1014,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.2</version>
<configuration>
<container>
<containerId>tomcat7x</containerId>
