NIFI-659 updated all instances of child overrides to combine their excludes and parents

This commit is contained in:
joewitt 2015-06-04 12:11:35 -04:00
parent 07628f76fe
commit fb75a4ba69
10 changed files with 10 additions and 10 deletions

View File

@ -48,7 +48,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/hypoglycemia</exclude> <exclude>src/test/resources/hypoglycemia</exclude>
<exclude>src/test/resources/hyperglycemia</exclude> <exclude>src/test/resources/hyperglycemia</exclude>
</excludes> </excludes>

View File

@ -107,7 +107,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/main/asciidoc/asciidoc-mod.css</exclude> <!-- MIT license confirmed. Excluding due to parse error--> <exclude>src/main/asciidoc/asciidoc-mod.css</exclude> <!-- MIT license confirmed. Excluding due to parse error-->
</excludes> </excludes>
</configuration> </configuration>

View File

@ -61,7 +61,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/hello.txt</exclude> <exclude>src/test/resources/hello.txt</exclude>
</excludes> </excludes>
</configuration> </configuration>

View File

@ -137,7 +137,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt</exclude> <exclude>src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt</exclude>
<exclude>src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt</exclude> <exclude>src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt</exclude>
</excludes> </excludes>

View File

@ -127,7 +127,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/conf/0bytes.xml</exclude> <exclude>src/test/resources/conf/0bytes.xml</exclude>
<exclude>src/test/resources/conf/termination-only.xml</exclude> <exclude>src/test/resources/conf/termination-only.xml</exclude>
<exclude>src/test/resources/hello.txt</exclude> <exclude>src/test/resources/hello.txt</exclude>

View File

@ -94,7 +94,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/main/webapp/js/hexview/hexview.default.css</exclude> <exclude>src/main/webapp/js/hexview/hexview.default.css</exclude>
<exclude>src/main/webapp/js/hexview/hexview.js</exclude> <exclude>src/main/webapp/js/hexview/hexview.js</exclude>
</excludes> </excludes>

View File

@ -595,7 +595,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>nbactions.xml</exclude> <exclude>nbactions.xml</exclude>
<exclude>src/main/webapp/js/json2.js</exclude> <exclude>src/main/webapp/js/json2.js</exclude>
<exclude>src/main/webapp/js/jquery/</exclude> <exclude>src/main/webapp/js/jquery/</exclude>

View File

@ -31,7 +31,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/hypoglycemia.hl7</exclude> <exclude>src/test/resources/hypoglycemia.hl7</exclude>
</excludes> </excludes>
</configuration> </configuration>

View File

@ -95,7 +95,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/solr/solr.xml</exclude> <exclude>src/test/resources/solr/solr.xml</exclude>
<exclude>src/test/resources/testCollection/core.properties</exclude> <exclude>src/test/resources/testCollection/core.properties</exclude>
<exclude>src/test/resources/testCollection/conf/_rest_managed.json</exclude> <exclude>src/test/resources/testCollection/conf/_rest_managed.json</exclude>

View File

@ -179,7 +179,7 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes combine.children="append">
<exclude>src/test/resources/localhost.cer</exclude> <exclude>src/test/resources/localhost.cer</exclude>
<exclude>src/test/resources/hello.txt</exclude> <exclude>src/test/resources/hello.txt</exclude>
<exclude>src/test/resources/CharacterSetConversionSamples/Converted.txt</exclude> <exclude>src/test/resources/CharacterSetConversionSamples/Converted.txt</exclude>