SLIDER-1129 remove all httpclient maven imports: use the one the Hadoop version gives you
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1154470d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1154470d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1154470d Branch: refs/heads/feature/SLIDER-1107_AM_config_generation Commit: 1154470d33e1eabde81e020119145996949e0df9 Parents: 34f559a Author: Steve Loughran <ste...@apache.org> Authored: Mon May 23 22:40:16 2016 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon May 23 22:40:16 2016 +0100 ---------------------------------------------------------------------- pom.xml | 31 +++++-------------------------- slider-core/pom.xml | 2 ++ 2 files changed, 7 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1154470d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 36f16c0..b1f2000 100644 --- a/pom.xml +++ b/pom.xml @@ -154,8 +154,6 @@ <gson.version>2.2.2</gson.version> <guice.version>3.0</guice.version> <httpclient.version>3.1</httpclient.version> - <httpclient4.version>4.5.2</httpclient4.version> - <httpcore.version>4.4.4</httpcore.version> <jackson.version>1.9.13</jackson.version> <jcommander.version>1.30</jcommander.version> @@ -522,12 +520,6 @@ </exclusions> </dependency> - <!-- hadoop-client includes the following jars, so they do not need to be - included separately: - hadoop-common, hadoop-hdfs (client?), hadoop-mapreduce-client-app, - hadoop-yarn-api, hadoop-mapreduce-client-core, - hadoop-mapreduce-client-jobclient, and hadoop-annotations - --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> @@ -541,14 +533,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> </exclusions> </dependency> @@ -569,14 +553,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> </exclusions> </dependency> @@ -697,6 +673,8 @@ <version>${commons-lang.version}</version> </dependency> +<!-- + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -708,7 +686,7 @@ </exclusion> </exclusions> </dependency> - + T <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -720,7 +698,8 @@ <artifactId>httpcore</artifactId> <version>${httpcore.version}</version> </dependency> - +--> + <!-- ======================================================== --> <!-- HBASE --> <!-- ======================================================== --> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1154470d/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index 6e942c0..8b921a5 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -326,6 +326,7 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> +<!-- <dependency> <groupId>commons-httpclient</groupId> @@ -337,6 +338,7 @@ <artifactId>httpclient</artifactId> <scope>test</scope> </dependency> +--> <dependency> <groupId>commons-lang</groupId>
