Author: khmarbaise
Date: Thu Nov 27 18:29:51 2014
New Revision: 1642201
URL: http://svn.apache.org/r1642201
Log:
[MENFORCER-216] Upgrade to maven-parent version 26
- Enhanced excludes in maven-enforcer-plugin to add
the excludes instead of replacing them.
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1642201&r1=1642200&r2=1642201&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Nov 27 18:29:51 2014
@@ -95,7 +95,7 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<!--
The manifest specification does not describe any method for
writing comments into the manifest.
-->
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1642201&r1=1642200&r2=1642201&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Nov 27 18:29:51 2014
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.enforcer</groupId>
