Repository: ambari Updated Branches: refs/heads/branch-2.6 e386a7a7a -> dda3687ae
AMBARI-22238 : Maven cleanup of ambari utility, logsearch and ambari metrics modules. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dda3687a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dda3687a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dda3687a Branch: refs/heads/branch-2.6 Commit: dda3687aec4fce612b385b3c8a72f35f43f45605 Parents: e386a7a Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Sun Oct 15 08:15:02 2017 -0700 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Sun Oct 15 08:15:13 2017 -0700 ---------------------------------------------------------------------- ambari-logsearch/ambari-logsearch-assembly/pom.xml | 7 ++++++- ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 6 ++++++ ambari-logsearch/ambari-logsearch-portal/pom.xml | 4 ++++ ambari-metrics/ambari-metrics-assembly/pom.xml | 2 ++ ambari-metrics/ambari-metrics-common/pom.xml | 6 ++++++ ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 ++++++++++ utility/pom.xml | 6 ++++++ 7 files changed, 40 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-logsearch/ambari-logsearch-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml b/ambari-logsearch/ambari-logsearch-assembly/pom.xml index 283179c..a017db1 100644 --- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml +++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml @@ -122,6 +122,9 @@ <sources> <source> <location>${solr.client.dir}/target/package</location> + <exclude> + <exclude>libs/checkstyle*.jar</exclude> + </exclude> </source> </sources> </mapping> @@ -149,6 +152,7 @@ <exclude>classes/user_pass.json</exclude> <exclude>classes/HadoopServiceConfig.json</exclude> <exclude>solr_configsets/**</exclude> + <exclude>libs/checkstyle*.jar</exclude> </excludes> </source> </sources> @@ -376,6 +380,7 @@ <group>root</group> <prefix>${solr.client.mapping.path}</prefix> </mapper> + <excludes>libs/checkstyle*.jar</excludes> </data> </dataSet> </configuration> @@ -404,7 +409,7 @@ <group>root</group> </mapper> <excludes> - classes/log4j.xml,classes/logsearch.properties,classes/user_pass.json,classes/HadoopServiceConfig.json,solr_configsets/** + classes/log4j.xml,classes/logsearch.properties,classes/user_pass.json,classes/HadoopServiceConfig.json,solr_configsets/**,libs/checkstyle*.jar </excludes> </data> <data> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index 49122e8..c6e4341 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -143,6 +143,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-logsearch/ambari-logsearch-portal/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml b/ambari-logsearch/ambari-logsearch-portal/pom.xml index a439266..10dbba4 100755 --- a/ambari-logsearch/ambari-logsearch-portal/pom.xml +++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml @@ -628,6 +628,10 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> </exclusion> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-metrics/ambari-metrics-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index b6b9ad7..7722db2 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -244,6 +244,7 @@ <excludes> <exclude>*tests.jar</exclude> <exclude>findbugs*.jar</exclude> + <exclude>jdk.tools*.jar</exclude> </excludes> </source> <source> @@ -264,6 +265,7 @@ <exclude>bin/*</exclude> <exclude>lib/*tests.jar</exclude> <exclude>lib/findbugs*.jar</exclude> + <exclude>lib/jdk.tools*.jar</exclude> </excludes> </source> </sources> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-metrics/ambari-metrics-common/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml index b52b1d9..fce8963 100644 --- a/ambari-metrics/ambari-metrics-common/pom.xml +++ b/ambari-metrics/ambari-metrics-common/pom.xml @@ -155,6 +155,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <version>2.6.0</version> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/ambari-metrics/ambari-metrics-timelineservice/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index 25373e7..6b4c0f5 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -326,6 +326,10 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> </exclusion> + <exclusion> + <groupId>net.sourceforge.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> </exclusions> </dependency> @@ -377,6 +381,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/dda3687a/utility/pom.xml ---------------------------------------------------------------------- diff --git a/utility/pom.xml b/utility/pom.xml index a708384..50b0046 100644 --- a/utility/pom.xml +++ b/utility/pom.xml @@ -40,6 +40,12 @@ <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.puppycrawl.tools</groupId>
