Repository: incubator-streams Updated Branches: refs/heads/master 4f100f3a2 -> 7d9b887ed
exceptions to apache-rat should be set in pluginManagement so as to not interfere with validate phase execution order # Conflicts: # streams-monitoring/pom.xml # streams-verbs/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/7d9b887e Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/7d9b887e Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/7d9b887e Branch: refs/heads/master Commit: 7d9b887edab943de07ad35a04a0dbbc69e00d69b Parents: 4f100f3 Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Mon Nov 7 11:01:57 2016 -0600 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Fri Nov 11 13:37:51 2016 -0600 ---------------------------------------------------------------------- streams-components/streams-filters/pom.xml | 34 ++++++++++--------- streams-contrib/streams-processor-json/pom.xml | 24 +++++++------- streams-contrib/streams-provider-rss/pom.xml | 22 +++++++------ streams-runtimes/streams-runtime-local/pom.xml | 22 +++++++------ streams-runtimes/streams-runtime-pig/pom.xml | 24 ++++++++------ streams-verbs/pom.xml | 36 ++++++++++++--------- 6 files changed, 91 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-components/streams-filters/pom.xml ---------------------------------------------------------------------- diff --git a/streams-components/streams-filters/pom.xml b/streams-components/streams-filters/pom.xml index 8ea6477..0f762e6 100644 --- a/streams-components/streams-filters/pom.xml +++ b/streams-components/streams-filters/pom.xml @@ -75,21 +75,23 @@ <directory>src/test/resources</directory> </testResource> </testResources> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/actor.json</exclude> - <exclude>src/test/resources/follow.json</exclude> - <exclude>src/test/resources/object.json</exclude> - <exclude>src/test/resources/post.json</exclude> - <exclude>src/test/resources/provider.json</exclude> - <exclude>src/test/resources/targetrequired.json</exclude> - </excludes> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/actor.json</exclude> + <exclude>src/test/resources/follow.json</exclude> + <exclude>src/test/resources/object.json</exclude> + <exclude>src/test/resources/post.json</exclude> + <exclude>src/test/resources/provider.json</exclude> + <exclude>src/test/resources/targetrequired.json</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-contrib/streams-processor-json/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-json/pom.xml b/streams-contrib/streams-processor-json/pom.xml index 562a1b9..3a1f1e4 100644 --- a/streams-contrib/streams-processor-json/pom.xml +++ b/streams-contrib/streams-processor-json/pom.xml @@ -86,17 +86,19 @@ <directory>src/test/resources</directory> </testResource> </testResources> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/books.json</exclude> - </excludes> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/books.json</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-contrib/streams-provider-rss/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml index de774c4..5cf8b79 100644 --- a/streams-contrib/streams-provider-rss/pom.xml +++ b/streams-contrib/streams-provider-rss/pom.xml @@ -198,15 +198,19 @@ <skipTests>${skipITs}</skipTests> </configuration> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/top100.txt</exclude> - </excludes> - </configuration> - </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/top100.txt</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-runtimes/streams-runtime-local/pom.xml ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/pom.xml b/streams-runtimes/streams-runtime-local/pom.xml index 9c2fea2..a568d7b 100644 --- a/streams-runtimes/streams-runtime-local/pom.xml +++ b/streams-runtimes/streams-runtime-local/pom.xml @@ -153,15 +153,19 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/TestFile.txt</exclude> - </excludes> - </configuration> - </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/TestFile.txt</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-runtimes/streams-runtime-pig/pom.xml ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-pig/pom.xml b/streams-runtimes/streams-runtime-pig/pom.xml index 9697b0b..8fe8ef7 100644 --- a/streams-runtimes/streams-runtime-pig/pom.xml +++ b/streams-runtimes/streams-runtime-pig/pom.xml @@ -202,16 +202,20 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/convertertestin.txt</exclude> - <exclude>src/test/resources/convertertestout.txt</exclude> - </excludes> - </configuration> - </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/convertertestin.txt</exclude> + <exclude>src/test/resources/convertertestout.txt</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7d9b887e/streams-verbs/pom.xml ---------------------------------------------------------------------- diff --git a/streams-verbs/pom.xml b/streams-verbs/pom.xml index c8f2865..cc82bde 100644 --- a/streams-verbs/pom.xml +++ b/streams-verbs/pom.xml @@ -164,22 +164,26 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/activities.txt</exclude> - <exclude>src/test/resources/actor.json</exclude> - <exclude>src/test/resources/do.json</exclude> - <exclude>src/test/resources/follow.json</exclude> - <exclude>src/test/resources/nofields.json</exclude> - <exclude>src/test/resources/object.json</exclude> - <exclude>src/test/resources/post.json</exclude> - <exclude>src/test/resources/provider.json</exclude> - </excludes> - </configuration> - </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/activities.txt</exclude> + <exclude>src/test/resources/actor.json</exclude> + <exclude>src/test/resources/do.json</exclude> + <exclude>src/test/resources/follow.json</exclude> + <exclude>src/test/resources/nofields.json</exclude> + <exclude>src/test/resources/object.json</exclude> + <exclude>src/test/resources/post.json</exclude> + <exclude>src/test/resources/provider.json</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
