You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/09/01 09:00:50 UTC

svn commit: r1621693 - in /syncope/trunk: ./ pom.xml

Author: ilgrosso
Date: Mon Sep  1 07:00:50 2014
New Revision: 1621693

URL: http://svn.apache.org/r1621693
Log:
Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1621325-1621692
  Merged /syncope/branches/1_1_X:r1621303-1621686

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1621693&r1=1621692&r2=1621693&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep  1 07:00:50 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>