You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2020/03/13 09:46:48 UTC
[hbase] branch branch-2 updated: HBASE-23861. Reconcile Hadoop
version. (#1179) (#1242)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new ba6d8c8 HBASE-23861. Reconcile Hadoop version. (#1179) (#1242)
ba6d8c8 is described below
commit ba6d8c8f27049358a74555bc7662e7eeff76a505
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Fri Mar 13 02:46:35 2020 -0700
HBASE-23861. Reconcile Hadoop version. (#1179) (#1242)
Signed-off-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Nick Dimiduk <nd...@apache.org>
(cherry picked from commit 6d9802fc2ea4d0da75164cabe58d620ade5c604a)
---
hbase-server/pom.xml | 7 -------
pom.xml | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index f8c3519..a2d5c15 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -615,9 +615,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
- <!--This dependency is not in top-level pom so needs
- version specified-->
- <version>${hadoop-two.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -726,9 +723,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
- <!--This dependency is not in top-level pom so needs
- version specified-->
- <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -741,7 +735,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/pom.xml b/pom.xml
index a263137..406607e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2759,6 +2759,18 @@
<artifactId>hadoop-annotations</artifactId>
<version>${hadoop-two.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -3106,6 +3118,18 @@
<version>${hadoop-three.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-three.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop-three.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>