This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new 33bd800 PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: fix regression with -Dhbase.version) 33bd800 is described below commit 33bd8008995157250b7f1444759bd8e7cefe051d Author: Istvan Toth <st...@apache.org> AuthorDate: Thu Dec 24 08:01:19 2020 +0100 PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: fix regression with -Dhbase.version) --- phoenix-hbase-compat-1.3.0/pom.xml | 52 ++++++++++++++++++++++++++++++- phoenix-hbase-compat-1.4.0/pom.xml | 64 +++++++++++++++++++++++++++++++++++++- phoenix-hbase-compat-1.5.0/pom.xml | 64 +++++++++++++++++++++++++++++++++++++- 3 files changed, 177 insertions(+), 3 deletions(-) diff --git a/phoenix-hbase-compat-1.3.0/pom.xml b/phoenix-hbase-compat-1.3.0/pom.xml index 1725cd6..faf351d 100644 --- a/phoenix-hbase-compat-1.3.0/pom.xml +++ b/phoenix-hbase-compat-1.3.0/pom.xml @@ -31,13 +31,63 @@ <description>Compatibility module for HBase 1.3.0+</description> <properties> - <hbase.version>1.3.0</hbase.version> + <hbase13.version>1.3.0</hbase13.version> </properties> <dependencies> + <!-- Override the parent dependencyManagement for every HBase artifact --> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-procedure</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase13.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase13.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/phoenix-hbase-compat-1.4.0/pom.xml b/phoenix-hbase-compat-1.4.0/pom.xml index a4c3b59..45c038f 100644 --- a/phoenix-hbase-compat-1.4.0/pom.xml +++ b/phoenix-hbase-compat-1.4.0/pom.xml @@ -31,13 +31,75 @@ <description>Compatibility module for HBase 1.4.0+</description> <properties> - <hbase.version>1.4.0</hbase.version> + <hbase14.version>1.4.0</hbase14.version> </properties> <dependencies> + <!-- Override the parent dependencyManagement for every HBase artifact --> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-metrics-api</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-metrics</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-procedure</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase14.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase14.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/phoenix-hbase-compat-1.5.0/pom.xml b/phoenix-hbase-compat-1.5.0/pom.xml index 6234239..8864f5b 100644 --- a/phoenix-hbase-compat-1.5.0/pom.xml +++ b/phoenix-hbase-compat-1.5.0/pom.xml @@ -31,13 +31,75 @@ <description>Compatibility module for HBase 1.5.0+</description> <properties> - <hbase.version>1.5.0</hbase.version> + <hbase15.version>1.5.0</hbase15.version> </properties> <dependencies> + <!-- Override the parent dependencyManagement for every HBase artifact --> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-metrics-api</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-metrics</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-procedure</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase15.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase15.version}</version> <scope>provided</scope> </dependency> </dependencies>