Repository: incubator-nifi Updated Branches: refs/heads/develop 07628f76f -> fb75a4ba6
NIFI-659 updated all instances of child overrides to combine their excludes and parents Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fb75a4ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fb75a4ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fb75a4ba Branch: refs/heads/develop Commit: fb75a4ba692ec834e470fc89de24bdd483439796 Parents: 07628f7 Author: joewitt <joew...@apache.org> Authored: Thu Jun 4 12:11:35 2015 -0400 Committer: joewitt <joew...@apache.org> Committed: Thu Jun 4 12:11:35 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +- .../nifi-framework/nifi-framework-cluster/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 2 +- .../nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml | 2 +- .../nifi-standard-bundle/nifi-standard-processors/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-commons/nifi-hl7-query-language/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml index eb46841..b6ead09 100644 --- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml +++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml @@ -48,7 +48,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/hypoglycemia</exclude> <exclude>src/test/resources/hyperglycemia</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-docs/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml index 1494745..c3d6735 100644 --- a/nifi/nifi-docs/pom.xml +++ b/nifi/nifi-docs/pom.xml @@ -107,7 +107,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/main/asciidoc/asciidoc-mod.css</exclude> <!-- MIT license confirmed. Excluding due to parse error--> </excludes> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml index cada04e..c69c3c8 100644 --- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml @@ -61,7 +61,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/hello.txt</exclude> </excludes> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml index 4cb2196..82712e2 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml @@ -137,7 +137,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <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/ips.txt</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 31aec72..c790419 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -127,7 +127,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/conf/0bytes.xml</exclude> <exclude>src/test/resources/conf/termination-only.xml</exclude> <exclude>src/test/resources/hello.txt</exclude> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml index ad01ab8..a0d3f48 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml @@ -94,7 +94,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/main/webapp/js/hexview/hexview.default.css</exclude> <exclude>src/main/webapp/js/hexview/hexview.js</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index ca9738f..84e0f8a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -595,7 +595,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>nbactions.xml</exclude> <exclude>src/main/webapp/js/json2.js</exclude> <exclude>src/main/webapp/js/jquery/</exclude> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml index 6c045b8..12d2d71 100644 --- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/hypoglycemia.hl7</exclude> </excludes> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index 261dc92..35c3b44 100644 --- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -95,7 +95,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/solr/solr.xml</exclude> <exclude>src/test/resources/testCollection/core.properties</exclude> <exclude>src/test/resources/testCollection/conf/_rest_managed.json</exclude> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fb75a4ba/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index a80fe08..f8c272c 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -179,7 +179,7 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude>src/test/resources/localhost.cer</exclude> <exclude>src/test/resources/hello.txt</exclude> <exclude>src/test/resources/CharacterSetConversionSamples/Converted.txt</exclude>
