You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/02/22 13:13:43 UTC
[phoenix] branch 5.1 updated: PHOENIX-6394 PostCommit Jenkins job
detects incorrect HBase profile to rebuild with 2.3 and 2.4
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 3ea1dc2 PHOENIX-6394 PostCommit Jenkins job detects incorrect HBase profile to rebuild with 2.3 and 2.4
3ea1dc2 is described below
commit 3ea1dc2ac18095ed11688dee6c30691965222b30
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Feb 22 09:31:32 2021 +0100
PHOENIX-6394 PostCommit Jenkins job detects incorrect HBase profile to rebuild with 2.3 and 2.4
---
Jenkinsfile | 2 +-
phoenix-core/pom.xml | 12 ++++++++++++
phoenix-server/pom.xml | 39 ++++++++++++++++++++++++---------------
pom.xml | 6 +++---
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e0a142..5ac2c3f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
timeout(time: 30, unit: 'MINUTES')
}
environment {
- HBASE_VERSION = sh(returnStdout: true, script: "mvn help:evaluate -Dhbase.profile=${HBASE_PROFILE} -Dartifact=org.apache.phoenix:phoenix-core -Dexpression=hbase.version -q -DforceStdout").trim()
+ HBASE_VERSION = sh(returnStdout: true, script: "mvn help:evaluate -Dexpression=hbase-{HBASE_PROFILE}.runtime.version -q -DforceStdout").trim()
}
steps {
sh "dev/rebuild_hbase.sh ${HBASE_VERSION}"
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 28a7db6..54d7d2a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -594,6 +594,9 @@
<value>2.3</value>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.3</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -610,6 +613,9 @@
<value>2.4.0</value>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.4.0</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -626,6 +632,9 @@
<value>2.4</value>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.4</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -641,6 +650,9 @@
<name>!hbase.profile</name>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.4</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 8fba46e..077490b 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -422,6 +422,9 @@
<value>2.3</value>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.3</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -439,6 +442,9 @@
<value>2.4.0</value>
</property>
</activation>
+ <properties>
+ <hbase.profile>2.4.0</hbase.profile>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -448,21 +454,24 @@
</dependencies>
</profile>
<profile>
- <id>phoenix-hbase-compat-2.4.1</id>
- <!-- keep dependency plugin happy -->
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.4</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-jute</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <id>phoenix-hbase-compat-2.4.1</id>
+ <!-- keep dependency plugin happy -->
+ <activation>
+ <property>
+ <name>hbase.profile</name>
+ <value>2.4</value>
+ </property>
+ </activation>
+ <properties>
+ <hbase.profile>2.4.0</hbase.profile>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>phoenix-hbase-compat-2.4.1-default</id>
diff --git a/pom.xml b/pom.xml
index c9f914a..e1fd8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<hbase-2.2.runtime.version>2.2.6</hbase-2.2.runtime.version>
<hbase-2.3.runtime.version>2.3.4</hbase-2.3.runtime.version>
<hbase-2.4.0.runtime.version>2.4.0</hbase-2.4.0.runtime.version>
- <hbase-2.4.1.runtime.version>2.4.1</hbase-2.4.1.runtime.version>
+ <hbase-2.4.runtime.version>2.4.1</hbase-2.4.runtime.version>
<!-- General Properties -->
<antlr-input.dir>src/main/antlr3</antlr-input.dir>
@@ -1539,7 +1539,7 @@
<properties>
<hbase.profile>2.4</hbase.profile>
<hbase.compat.version>2.4.1</hbase.compat.version>
- <hbase.version>${hbase-2.4.1.runtime.version}</hbase.version>
+ <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
<hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
<zookeeper.version>3.5.7</zookeeper.version>
</properties>
@@ -1625,7 +1625,7 @@
<properties>
<hbase.profile>2.4</hbase.profile>
<hbase.compat.version>2.4.1</hbase.compat.version>
- <hbase.version>${hbase-2.4.1.runtime.version}</hbase.version>
+ <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
<hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
<zookeeper.version>3.5.7</zookeeper.version>
</properties>