This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 6d9802f HBASE-23861. Reconcile Hadoop version. (#1179)
6d9802f is described below
commit 6d9802fc2ea4d0da75164cabe58d620ade5c604a
Author: Wei-Chiu Chuang <weic...@apache.org>
AuthorDate: Wed Mar 4 08:01:40 2020 -0800
HBASE-23861. Reconcile Hadoop version. (#1179)
Signed-off-by: Sean Busbey <bus...@apache.org>
Signed-off-by: Nick Dimiduk <ndimi...@apache.org>
---
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 57227ab..001ee98 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -612,9 +612,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>
@@ -723,9 +720,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>
@@ -738,7 +732,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 6fc2db9..fe07edf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2942,6 +2942,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>
@@ -3289,6 +3301,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>
