You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2021/01/27 03:55:45 UTC
[bigtop] branch master updated: BIGTOP-3283. Bump HBase to 2.2.6.
(#715)
This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new facea3e BIGTOP-3283. Bump HBase to 2.2.6. (#715)
facea3e is described below
commit facea3e9e5218f008f04f4e91e1e6858dcf79501
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Jan 27 12:55:35 2021 +0900
BIGTOP-3283. Bump HBase to 2.2.6. (#715)
---
.../src/common/hbase/do-component-build | 10 +++++---
.../hbase/patch0-exclude-spotbugs-annotations.diff | 15 +++++++++++
.../src/common/hbase/patch0-jline-jrub.diff | 15 -----------
.../src/common/hbase/patch1-HBASE-19663.diff | 29 ----------------------
bigtop.bom | 2 +-
5 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index 4541dad..c34e9e9 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -41,15 +41,19 @@ if [ $HOSTTYPE = "aarch64" ] ; then
'\ <\/dependency>' pom.xml
fi
+MVN_ARGS="-Phadoop-3.0 "
MVN_ARGS="-DskipTests "
+MVN_ARGS+="-Dhadoop-three.version=${HADOOP_VERSION} "
MVN_ARGS+="-Dslf4j.version=1.7.25 "
-MVN_ARGS+="-Dhadoop-two.version=${HADOOP_VERSION} "
MVN_ARGS+="-Dzookeeper.version=${ZOOKEEPER_VERSION} "
MVN_ARGS+="-Dcheckstyle.skip=true "
-mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} install "$@"
+
+# HBASE-21513: separate site and assembly:single to avoid assembly issues.
+mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} clean install "$@"
mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} site "$@"
mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} package assembly:single "$@"
rm -rf build
mkdir build
-tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase*.tar.gz
+tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase-${HBASE_VERSION}-bin.tar.gz
+tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase-${HBASE_VERSION}-client-bin.tar.gz
diff --git a/bigtop-packages/src/common/hbase/patch0-exclude-spotbugs-annotations.diff b/bigtop-packages/src/common/hbase/patch0-exclude-spotbugs-annotations.diff
new file mode 100644
index 0000000..6ba0bd1
--- /dev/null
+++ b/bigtop-packages/src/common/hbase/patch0-exclude-spotbugs-annotations.diff
@@ -0,0 +1,15 @@
+diff --git a/pom.xml b/pom.xml
+index c585d6fc9c..2fffe22e1b 100755
+--- a/pom.xml
++++ b/pom.xml
+@@ -1869,6 +1869,10 @@
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>com.github.spotbugs</groupId>
++ <artifactId>spotbugs-annotations</artifactId>
++ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
diff --git a/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff b/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff
deleted file mode 100644
index d6aa4e7..0000000
--- a/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./hbase-shell/src/main/ruby/shell/formatter.rb.orig 2017-04-22 12:39:16.617041337 +0000
-+++ ./hbase-shell/src/main/ruby/shell/formatter.rb 2017-04-22 12:40:46.642890485 +0000
-@@ -30,7 +30,11 @@
-
- def refresh_width()
- if $stdout.tty?
-- @max_width = Java::jline.Terminal.getTerminal().getTerminalWidth()
-+ if Java::jline.Terminal.respond_to?(:getTerminal)
-+ @max_width = Java::jline.Terminal.getTerminal.getTerminalWidth
-+ else
-+ @max_width = Java::jline.TerminalFactory.get.getWidth
-+ end
- else
- @max_width = 0
- end
diff --git a/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff b/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff
deleted file mode 100644
index d035305..0000000
--- a/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d0d7973f97424a16047cbab2b8ced43f90b4e7a Mon Sep 17 00:00:00 2001
-From: Sean Busbey <bu...@apache.org>
-Date: Wed, 16 Oct 2019 10:31:47 -0500
-Subject: [PATCH] HBASE-19663 javadoc creation needs jsr305.
-
----
- pom.xml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index 5461457ee0..0cc1f28d6d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -2908,6 +2908,12 @@
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.version}</version>
- </additionalDependency>
-+ <!-- javadoc tooling requires jsr305 due to references to it from things we rely on -->
-+ <additionalDependency>
-+ <groupId>com.google.code.findbugs</groupId>
-+ <artifactId>jsr305</artifactId>
-+ <version>3.0.2</version>
-+ </additionalDependency>
- </additionalDependencies>
- </configuration>
- <reportSets>
---
-2.16.1
-
diff --git a/bigtop.bom b/bigtop.bom
index e7ffe33..66096d9 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -169,7 +169,7 @@ bigtop {
'hbase' {
name = 'hbase'
relNotes = 'Apache HBase'
- version { base = '1.5.0'; pkg = base; release = 1 }
+ version { base = '2.2.6'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/${version.base}/"