From 1f4b90a8f085a0f1a3091545645ce414ff9c695c Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 12 Jun 2019 14:31:03 -0700 Subject: [PATCH] HBASE-22574 hbase-filesystem does not build against HBase 1 --- hbase-oss/pom.xml | 14 ------------- pom.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/hbase-oss/pom.xml b/hbase-oss/pom.xml index e21c84d..35c691a 100644 --- a/hbase-oss/pom.xml +++ b/hbase-oss/pom.xml @@ -359,20 +359,6 @@ test - - org.apache.hbase - hbase-zookeeper - ${hbase.version} - test - - - org.apache.hbase - hbase-zookeeper - ${hbase.version} - test-jar - test - - diff --git a/pom.xml b/pom.xml index 97c697d..098ebc8 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,9 @@ 23.0 2.9.2 3.2.0 - 2.1.4 + 1.4.10 + 2.1.4 + 2.2.1 4.12 1.2.17 1.7.25 @@ -126,5 +128,52 @@ ${hadoop3.version} + + + hbase2 + + + !hbase.profile + + + + ${hbase2.version} + + + + org.apache.hbase + hbase-zookeeper + ${hbase2.version} + test + + + org.apache.hbase + hbase-zookeeper + ${hbase2.version} + test-jar + test + + + + + hbase1 + + + hbase.profile + 1 + + + + ${hbase1.version} + + + + org.apache.hbase.thirdparty + hbase-shaded-miscellaneous + ${hbase-thirdparty.version} + + + + -- 2.21.0