You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2019/03/25 17:12:20 UTC
[hbase] branch branch-1.4 updated: HBASE-22058 upgrade thrift
dependency to 0.9.3.1
This is an automated email from the ASF dual-hosted git repository.
toffer pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.4 by this push:
new b649bce HBASE-22058 upgrade thrift dependency to 0.9.3.1
b649bce is described below
commit b649bce1609fdcde7b1c21a0767ee502d20091e3
Author: Francis Liu <to...@apache.org>
AuthorDate: Tue Mar 19 16:49:36 2019 -0700
HBASE-22058 upgrade thrift dependency to 0.9.3.1
---
hbase-thrift/pom.xml | 7 ++++---
pom.xml | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 6f73c35..7388f15 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -408,12 +408,12 @@
<requireProperty>
<property>thrift.version</property>
<message>"The Thrift version must be specified."</message>
- <regex>0\.9\.3</regex>
+ <regex>0\.9\.3-1</regex>
<regexMessage>
-
-
[FATAL] ==========================================================================================
-[FATAL] HBase Thrift requires the thrift generator version 0.9.3.
+[FATAL] HBase Thrift requires the thrift generator version 0.9.3-1.
[FATAL] Setting it to something else needs to be reviewed for wire and behavior compatibility.
[FATAL] ==========================================================================================
-
@@ -442,8 +442,9 @@
<workingDirectory>${basedir}</workingDirectory>
<arguments>
<argument>-c</argument>
+ <!-- Hardcode the version number here since curent thrift.version (0.9.3-1), is a java-only release -->
<argument>${thrift.path} -version | \
- fgrep 'Thrift version ${thrift.version}' && exit 0;
+ fgrep 'Thrift version 0.9.3' && exit 0;
echo "========== [FATAL] Need Thrift version ${thrift.version} ==========";
exit 1</argument>
</arguments>
diff --git a/pom.xml b/pom.xml
index a80fe62..0edeccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1296,7 +1296,7 @@
<mockito-all.version>1.10.19</mockito-all.version>
<protobuf.version>2.5.0</protobuf.version>
<thrift.path>thrift</thrift.path>
- <thrift.version>0.9.3</thrift.version>
+ <thrift.version>0.9.3-1</thrift.version>
<zookeeper.version>3.4.10</zookeeper.version>
<slf4j.version>1.7.7</slf4j.version>
<clover.version>4.0.3</clover.version>