maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject svn commit: r1641047 - in /maven/jxr/trunk: maven-jxr-plugin/pom.xml maven-jxr/pom.xml pom.xml
Date Sat, 22 Nov 2014 11:41:23 GMT
Author: khmarbaise
Date: Sat Nov 22 11:41:22 2014
New Revision: 1641047

URL: http://svn.apache.org/r1641047
Log:
[JXR-124] Remove excluded DEPENDENCIES file if new parent is used.
 - Fixed configuration for apache-rat-plugin to added
   execludes instead of replacing them.

Modified:
    maven/jxr/trunk/maven-jxr-plugin/pom.xml
    maven/jxr/trunk/maven-jxr/pom.xml
    maven/jxr/trunk/pom.xml

Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1641047&r1=1641046&r2=1641047&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Sat Nov 22 11:41:22 2014
@@ -75,7 +75,7 @@ under the License.
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
               <!--
                 This file is in a format that doesn't support comments, so a
                 license header can not be applied.

Modified: maven/jxr/trunk/maven-jxr/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/pom.xml?rev=1641047&r1=1641046&r2=1641047&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr/pom.xml Sat Nov 22 11:41:22 2014
@@ -46,14 +46,14 @@ under the License.
                http://jira.codehaus.org/browse/JXR-117
           -->
           <configuration>
-            <excludes>**/JavaCodeTransform.java</excludes>
+            <excludes combine.children="append">**/JavaCodeTransform.java</excludes>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
               <!--
                 This file has been copied and is under another license which
                 allows redistribution and use in source and binary forms, under

Modified: maven/jxr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1641047&r1=1641046&r2=1641047&view=diff
==============================================================================
--- maven/jxr/trunk/pom.xml (original)
+++ maven/jxr/trunk/pom.xml Sat Nov 22 11:41:22 2014
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>25</version>
+    <version>26</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -103,23 +103,6 @@ under the License.
             <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
         </plugin>
-        <!-- 
-             Requested an enhancement:
-             https://issues.apache.org/jira/browse/RAT-184
-             http://jira.codehaus.org/browse/JXR-122
-             This needed to be added to ingore the generated DEPENDENCIES files
-             otherwise we will have a release in release area which can't be built
-             without changing.
-        -->
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>DEPENDENCIES</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>



Mime
View raw message