Author: ilgrosso
Date: Tue Oct 14 10:25:44 2014
New Revision: 1631710
URL: http://svn.apache.org/r1631710
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1630357-1631709
Merged /syncope/branches/1_1_X:r1629005-1631708
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1631710&r1=1631709&r2=1631710&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Oct 14 10:25:44 2014
@@ -1080,7 +1080,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
