[JXR-124] Remove excluded DEPENDENCIES file if new parent is used.
- Fixed configuration for apache-rat-plugin to added
execludes instead of replacing them.
git-svn-id: https://svn.apache.org/repos/asf/maven/jxr/trunk@1641047 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 2eab674..5ba2e8d 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -75,7 +75,7 @@
<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.
diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index e7a65ee..02f8eb4 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -46,14 +46,14 @@
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
diff --git a/pom.xml b/pom.xml
index e80db09..bc850c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<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 @@
<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>
