This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 541246a PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: fix regression with -Dhbase.version)
541246a is described below
commit 541246a673e6b89e589bd5247cff6e7c35ab071b
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Dec 24 07:08:40 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: fix regression with -Dhbase.version)
---
phoenix-hbase-compat-2.1.6/pom.xml | 5 ++++-
phoenix-hbase-compat-2.2.1/pom.xml | 5 ++++-
phoenix-hbase-compat-2.3.0/pom.xml | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index 119c31b..0794dd5 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -32,7 +32,7 @@
<description>Compatibility module for HBase 2.1.6+</description>
<properties>
- <hbase.version>2.1.6</hbase.version>
+ <hbase21.compat.version>2.1.6</hbase21.compat.version>
</properties>
<dependencies>
@@ -40,16 +40,19 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
+ <version>${hbase21.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
+ <version>${hbase21.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
+ <version>${hbase21.compat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index d54cebf..34f8105 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -31,7 +31,7 @@
<description>Compatibility module for HBase 2.2.1+</description>
<properties>
- <hbase.version>2.2.1</hbase.version>
+ <hbase22.compat.version>2.2.1</hbase22.compat.version>
</properties>
<dependencies>
@@ -39,16 +39,19 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
+ <version>${hbase22.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
+ <version>${hbase22.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
+ <version>${hbase22.compat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml
b/phoenix-hbase-compat-2.3.0/pom.xml
index 7ea1827..4300624 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -31,7 +31,7 @@
<description>Compatibility module for HBase 2.3.0+</description>
<properties>
- <hbase.version>2.3.0</hbase.version>
+ <hbase23.compat.version>2.3.0</hbase23.compat.version>
</properties>
<dependencies>
@@ -39,16 +39,19 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
+ <version>${hbase23.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
+ <version>${hbase23.compat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
+ <version>${hbase23.compat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
