Repository: hbase Updated Branches: refs/heads/branch-2 6af3ee44c -> 299850ea7
HBASE-18209 Include httpclient / httpcore jars in build artifacts Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/299850ea Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/299850ea Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/299850ea Branch: refs/heads/branch-2 Commit: 299850ea70bbb86e2d4c8ef0b1cead2b67e079d8 Parents: 6af3ee4 Author: tedyu <[email protected]> Authored: Wed Jun 14 21:00:12 2017 -0700 Committer: tedyu <[email protected]> Committed: Wed Jun 14 21:00:12 2017 -0700 ---------------------------------------------------------------------- hbase-assembly/pom.xml | 8 ++++++++ hbase-server/pom.xml | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/299850ea/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index ccc4141..aefb886 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -247,6 +247,14 @@ <artifactId>hbase-spark</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/299850ea/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index bdb1e1a..2ba53dd 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -557,8 +557,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <!-- Overriden to get some SPNEGO classes only in newer version --> - <version>4.5.2</version> <scope>test</scope> </dependency> <dependency>
