You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/04/09 12:19:05 UTC
svn commit: r1738344 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise
Date: Sat Apr 9 10:19:05 2016
New Revision: 1738344
URL: http://svn.apache.org/viewvc?rev=1738344&view=rev
Log:
[MSHARED-510] Add missing apache-rat-plugin configuration for keystore
o Followup cause remove duplicate configuration which simply
overwrites parent instead of appending.
Index: pom.xml
===================================================================
--- pom.xml (revision 1738342)
+++ pom.xml (working copy)
@@ -91,11 +91,15 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
+ <!--
+ ! Using append to prevent overwriting of
+ ! inherited configuration.
+ -->
<excludes combine.children="append">
<!--
! Binary file so no license possible
-->
- <exclude>src/test/keystory</exclude>
+ <exclude>src/test/keystore</exclude>
</excludes>
</configuration>
</plugin>
@@ -115,15 +119,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/keystore</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Modified:
maven/shared/trunk/maven-jarsigner/pom.xml
Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1738344&r1=1738343&r2=1738344&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/pom.xml (original)
+++ maven/shared/trunk/maven-jarsigner/pom.xml Sat Apr 9 10:19:05 2016
@@ -91,11 +91,15 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
+ <!--
+ ! Using append to prevent overwriting of
+ ! inherited configuration.
+ -->
<excludes combine.children="append">
<!--
! Binary file so no license possible
-->
- <exclude>src/test/keystory</exclude>
+ <exclude>src/test/keystore</exclude>
</excludes>
</configuration>
</plugin>
@@ -115,15 +119,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/keystore</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>