PHOENIX-3088 Drastically reduce apache-rat-plugin excludes The apache-rat-plugin is already configured to exclude many of the things that we were overriding the exclusions in pluginManagement to exclude for us. All of these were removed. Exclusion configuration moved from pluginMangement to plugins to avoid unintentional exclusions in child modules (that were only meant to applied at the parent pom)
Also removes manual configuration of apache-rat-plugin version to use the version set in apache parent pom. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/02c801d0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/02c801d0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/02c801d0 Branch: refs/heads/4.x-HBase-0.98 Commit: 02c801d0dfe484beba3c8ed5135a0f076195f98c Parents: e921ef2 Author: Josh Elser <els...@apache.org> Authored: Mon Jul 18 18:55:08 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 21 15:46:48 2016 -0400 ---------------------------------------------------------------------- phoenix-core/pom.xml | 10 +++++++++ phoenix-queryserver-client/pom.xml | 9 +++++++++ phoenix-spark/README.md | 19 ++++++++++++++++- pom.xml | 36 ++------------------------------- 4 files changed, 39 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/02c801d0/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 2bc5cc4..4a2de67 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -218,6 +218,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/java/org/apache/phoenix/coprocessor/generated/*.java</exclude> + <exclude>src/main/resources/java.sql.Driver</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/phoenix/blob/02c801d0/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index a2522f8..40915e9 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -158,6 +158,15 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/phoenix/blob/02c801d0/phoenix-spark/README.md ---------------------------------------------------------------------- diff --git a/phoenix-spark/README.md b/phoenix-spark/README.md index 1e53c98..3674b8f 100644 --- a/phoenix-spark/README.md +++ b/phoenix-spark/README.md @@ -1,3 +1,20 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + phoenix-spark extends Phoenix's MapReduce support to allow Spark to load Phoenix tables as RDDs or DataFrames, and enables persisting RDDs of Tuples back to Phoenix. @@ -144,4 +161,4 @@ in the `conf` parameter. Similarly, if no configuration is passed in, `zkUrl` mu - Basic support for column and predicate pushdown using the Data Source API - The Data Source API does not support passing custom Phoenix settings in configuration, you must create the DataFrame or RDD directly if you need fine-grained configuration. -- No support for aggregate or distinct functions (http://phoenix.apache.org/phoenix_mr.html) \ No newline at end of file +- No support for aggregate or distinct functions (http://phoenix.apache.org/phoenix_mr.html) http://git-wip-us.apache.org/repos/asf/phoenix/blob/02c801d0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 46f97f8..8b1b506 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,6 @@ <maven-dependency-plugin.version>2.1</maven-dependency-plugin.version> <maven.assembly.version>2.5.2</maven.assembly.version> - <maven.rat.version>0.8</maven.rat.version> <!-- Plugin options --> <numForkedUT>3</numForkedUT> @@ -180,39 +179,8 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>${maven.rat.version}</version> - <configuration> - <excludes> - <exclude>CHANGES</exclude> - <exclude>README.md</exclude> - <exclude>README</exclude> - <exclude>dev/phoenix.importorder</exclude> - <exclude>dev/release_files/**</exclude> - <exclude>**/target/**</exclude> - <exclude>**/resources/*.Driver</exclude> - <exclude>**/META-INF/**</exclude> - <exclude>**/*.properties</exclude> - <exclude>**/*.proto</exclude> - <exclude>**/*.versionsBackup</exclude> - <!-- properties files need no license --> - <exclude>**/*.properties</exclude> - <!-- exclude docs --> - <exclude>docs/**</exclude> - <!-- exclude examples --> - <exclude>examples/**</exclude> - <!-- exclude source control files --> - <exclude>.gitignore</exclude> - <exclude>.git/**</exclude> - <!-- exclude IDE files --> - <exclude>**/.idea/**</exclude> - <exclude>**/*.iml</exclude> - <exclude>.project</exclude> - <exclude>.classpath</exclude> - <exclude>.settings/**</exclude> - <exclude>**/*Protos.java</exclude> - <exclude>**/java.sql.Driver</exclude> - </excludes> - </configuration> + <!-- Avoid defining exclusions in pluginManagement as they are global. + We already inherit some from the ASF parent pom. --> </plugin> <!-- We put slow-running tests into src/it and run them during the integration-test phase using the failsafe plugin. This way