Repository: incubator-rya Updated Branches: refs/heads/master bd4552582 -> 7d81364d0
RYA-176 Closes #93. Adding DEPENDENCIES to RAT Exclusion Also performing minor cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/7d81364d Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/7d81364d Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/7d81364d Branch: refs/heads/master Commit: 7d81364d0e8a0d02b9c3a4ef983944f22c8b8a03 Parents: bd45525 Author: Aaron Mihalik <[email protected]> Authored: Tue Sep 13 12:32:25 2016 -0400 Committer: pujav65 <[email protected]> Committed: Tue Sep 27 11:54:46 2016 -0400 ---------------------------------------------------------------------- extras/rya.console/pom.xml | 13 +++++++++++++ extras/rya.merger/pom.xml | 10 +--------- extras/vagrantExample/pom.xml | 20 +++++++++++--------- pig/accumulo.pig/pom.xml | 26 +++++++++++++++----------- pom.xml | 13 ++++++++++++- 5 files changed, 52 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7d81364d/extras/rya.console/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.console/pom.xml b/extras/rya.console/pom.xml index df9e78a..9513c59 100644 --- a/extras/rya.console/pom.xml +++ b/extras/rya.console/pom.xml @@ -97,6 +97,19 @@ </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>spring-shell.log</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <!-- Automatically place Apache 2 license headers at the top of all of the project's Java files. Rat runs during the 'validate' lifecycle step, so it will fail the build before this one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7d81364d/extras/rya.merger/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index 425601b..d7c6ef5 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -176,7 +176,7 @@ under the License. <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes> - Accumulo data Files + <!-- Accumulo data Files --> <exclude>**/*.rf</exclude> </excludes> </configuration> @@ -184,14 +184,6 @@ under the License. </plugins> </pluginManagement> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> <!-- <plugin> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7d81364d/extras/vagrantExample/pom.xml ---------------------------------------------------------------------- diff --git a/extras/vagrantExample/pom.xml b/extras/vagrantExample/pom.xml index 47441a3..937952e 100644 --- a/extras/vagrantExample/pom.xml +++ b/extras/vagrantExample/pom.xml @@ -30,17 +30,19 @@ under the License. <name>Apache Rya Vagrant VM</name> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> <!-- Vagrant may leave around some files. These are not checked in --> <exclude>**/src/main/vagrant/.vagrant/**</exclude> </excludes> - </configuration> - </plugin> - </plugins> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7d81364d/pig/accumulo.pig/pom.xml ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/pom.xml b/pig/accumulo.pig/pom.xml index 1a1e5f9..f1326b9 100644 --- a/pig/accumulo.pig/pom.xml +++ b/pig/accumulo.pig/pom.xml @@ -63,19 +63,23 @@ under the License. </dependency> </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/test/resources/ResultsFile1.txt</exclude> + <exclude>src/test/resources/testQuery.txt</exclude> + <exclude>src/test/resources/testQuery2.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/ResultsFile1.txt</exclude> - <exclude>src/test/resources/testQuery.txt</exclude> - <exclude>src/test/resources/testQuery2.txt</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/7d81364d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d5a34f9..8afa589 100644 --- a/pom.xml +++ b/pom.xml @@ -747,13 +747,23 @@ under the License. </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <!-- Apache Release Audit Tool - reports missing license headers and other issues. --> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>DEPENDENCIES</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> @@ -765,6 +775,7 @@ under the License. </plugin> <plugin> <!-- Apache Release Audit Tool - reports missing license headers and other issues. --> + <!-- Note: Add exclusions to deepest maven submodule/project in the plug-in management section --> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <executions>
