Author: ilgrosso
Date: Tue Oct 14 10:24:45 2014
New Revision: 1631709
URL: http://svn.apache.org/r1631709
Log:
Merge from 1_1_X
Modified:
syncope/branches/1_2_X/ (props changed)
syncope/branches/1_2_X/pom.xml
Propchange: syncope/branches/1_2_X/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1629005-1631708
Modified: syncope/branches/1_2_X/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/pom.xml?rev=1631709&r1=1631708&r2=1631709&view=diff
==============================================================================
--- syncope/branches/1_2_X/pom.xml (original)
+++ syncope/branches/1_2_X/pom.xml Tue Oct 14 10:24:45 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>
