Author: ilgrosso
Date: Mon Sep 1 07:00:21 2014
New Revision: 1621692
URL: http://svn.apache.org/r1621692
Log:
Merge from 1_2_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:r1621303-1621686
Modified: syncope/branches/1_2_X/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/pom.xml?rev=1621692&r1=1621691&r2=1621692&view=diff
==============================================================================
--- syncope/branches/1_2_X/pom.xml (original)
+++ syncope/branches/1_2_X/pom.xml Mon Sep 1 07:00:21 2014
@@ -1417,7 +1417,7 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <inherited>true</inherited>
+ <version>0.11</version>
<configuration>
<excludes>
<exclude>nbactions.xml</exclude>
@@ -1531,7 +1531,7 @@ under the License.
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
