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/499fec3c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/499fec3c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/499fec3c Branch: refs/heads/branch-3.0-perf Commit: 499fec3c1ec7ddd18fae3a415da7e4d5de82d63b Parents: 43fb597 Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Sun Oct 15 09:41:13 2017 -0700 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Sun Oct 15 09:41:13 2017 -0700 ---------------------------------------------------------------------- ambari-infra/ambari-infra-assembly/pom.xml | 4 ++++ ambari-logsearch/ambari-logsearch-assembly/pom.xml | 4 +++- ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 4 ++++ ambari-logsearch/ambari-logsearch-server/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 ++++++++++ ambari-utility/pom.xml | 6 ++++++ 8 files changed, 39 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/499fec3c/ambari-infra/ambari-infra-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-assembly/pom.xml b/ambari-infra/ambari-infra-assembly/pom.xml index dfb5c01..2b4959b 100644 --- a/ambari-infra/ambari-infra-assembly/pom.xml +++ b/ambari-infra/ambari-infra-assembly/pom.xml @@ -120,6 +120,9 @@ <sources> <source> <location>${solr.client.dir}/target/package</location> + <exclude> + <exclude>libs/checkstyle*.jar</exclude> + </exclude> </source> </sources> </mapping> @@ -324,6 +327,7 @@ <group>root</group> <prefix>${solr.client.mapping.path}</prefix> </mapper> + <excludes>libs/checkstyle*.jar</excludes> </data> </dataSet> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/499fec3c/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 e8a9426..cbc62ce 100644 --- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml +++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml @@ -94,6 +94,7 @@ <exclude>classes/user_pass.json</exclude> <exclude>classes/HadoopServiceConfig.json</exclude> <exclude>solr_configsets/**</exclude> + <exclude>libs/checkstyle*.jar</exclude> </excludes> </source> </sources> @@ -241,7 +242,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> @@ -267,6 +268,7 @@ <user>root</user> <group>root</group> </mapper> + <excludes>libs/checkstyle*.jar</excludes> </data> </dataSet> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/499fec3c/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 091f957..b1b6ece 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -163,6 +163,10 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</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/499fec3c/ambari-logsearch/ambari-logsearch-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index e90c58d..2ad35f5 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -380,6 +380,10 @@ <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> </exclusion> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/499fec3c/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 d9875ce..9925947 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -245,6 +245,7 @@ <excludes> <exclude>*tests.jar</exclude> <exclude>findbugs*.jar</exclude> + <exclude>jdk.tools*.jar</exclude> </excludes> </source> <source> @@ -265,6 +266,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/499fec3c/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 cae9734..aa16ba9 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/499fec3c/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 a5eb572..ca72bc7 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/499fec3c/ambari-utility/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml index 1e86d40..4a32872 100644 --- a/ambari-utility/pom.xml +++ b/ambari-utility/pom.xml @@ -55,6 +55,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>