This is an automated email from the ASF dual-hosted git repository. ywkim 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 4d2b50b BIGTOP-3297. Bump HBase to 1.5.0. 4d2b50b is described below commit 4d2b50b4635e755694f4e46ea0ee67de3df344c6 Author: Masatake Iwasaki <iwasak...@apache.org> AuthorDate: Mon Feb 3 01:47:47 2020 +0000 BIGTOP-3297. Bump HBase to 1.5.0. Signed-off-by: Youngwoo Kim <yw...@apache.org> --- .../src/common/hbase/do-component-build | 2 +- .../src/common/hbase/patch1-HBASE-19663.diff | 29 +++ .../patch2-0002-Backport-HBASE-17893-to-1.3.diff | 278 --------------------- bigtop.bom | 2 +- 4 files changed, 31 insertions(+), 280 deletions(-) diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build index 70b83cf..114f2e5 100644 --- a/bigtop-packages/src/common/hbase/do-component-build +++ b/bigtop-packages/src/common/hbase/do-component-build @@ -36,7 +36,7 @@ if [ $HOSTTYPE = "aarch64" ] ; then sed -i '/<version>1.5.0-alpha.6<\/version>/,+1d' ./pom.xml sed -i '/<artifactId>asciidoctorj-pdf<\/artifactId>/a\<version>1.5.0-alpha.6<\/version>\n</dependency>\n<dependency>\n<groupId>org.jruby<\/groupId>\n<artifactId>jruby-complete<\/artifactId>\n<version>9.1.8.0<\/version>\n<\/dependency>' ./pom.xml fi -mvn -DskipTests -Dslf4j.version=1.6.1 \ +mvn -DskipTests -Dslf4j.version=1.7.25 \ -Dhadoop-two.version=$HADOOP_VERSION \ -Dzookeeper.version=$ZOOKEEPER_VERSION \ -Dcheckstyle.skip=true \ diff --git a/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff b/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff new file mode 100644 index 0000000..d035305 --- /dev/null +++ b/bigtop-packages/src/common/hbase/patch1-HBASE-19663.diff @@ -0,0 +1,29 @@ +From 2d0d7973f97424a16047cbab2b8ced43f90b4e7a Mon Sep 17 00:00:00 2001 +From: Sean Busbey <bus...@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-packages/src/common/hbase/patch2-0002-Backport-HBASE-17893-to-1.3.diff b/bigtop-packages/src/common/hbase/patch2-0002-Backport-HBASE-17893-to-1.3.diff deleted file mode 100644 index 8bfaec0..0000000 --- a/bigtop-packages/src/common/hbase/patch2-0002-Backport-HBASE-17893-to-1.3.diff +++ /dev/null @@ -1,278 +0,0 @@ -From 1a58e47067d64866917b8834eabc37e4c2887ebb Mon Sep 17 00:00:00 2001 -From: Anton Chevychalov <p...@mnu.pp.ru> -Date: Fri, 8 Sep 2017 19:20:48 +0300 -Subject: [PATCH 2/2] Backport HBASE-17893 to 1.3 - ---- - .../src/main/resources/supplemental-models.xml | 222 +++++++++++++++++++++ - 1 file changed, 222 insertions(+) - -diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml -index d5495cb..e8e6bbb 100644 ---- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml -+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml -@@ -644,6 +644,21 @@ under the License. - </project> - </supplement> - <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>org.apache.commons</groupId> -+ <artifactId>commons-csv</artifactId> -+ <version>1.0</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ -+ <supplement> - <project> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> -@@ -714,6 +729,21 @@ under the License. - </project> - </supplement> - <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>org.apache.curator</groupId> -+ <artifactId>curator-test</artifactId> -+ <version>2.7.1</version> -+ -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> - <project> - <groupId>org.apache.directory.api</groupId> - <artifactId>api-asn1-api</artifactId> -@@ -783,6 +813,21 @@ under the License. - </licenses> - </project> - </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>org.apache.htrace</groupId> -+ <artifactId>htrace-core4</artifactId> -+ <version>4.0.1-incubating</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ - <!-- Used by Hadoop 2.6 --> - <supplement> - <project> -@@ -980,6 +1025,7 @@ under the License. - </licenses> - </project> - </supplement> -+ - <!-- Ambiguous license names in server and not in client --> - <supplement> - <project> -@@ -1082,6 +1128,143 @@ Copyright 2006 Envoi Solutions LLC - </licenses> - </project> - </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>com.codahale.metrics</groupId> -+ <artifactId>metrics-core</artifactId> -+ <version>3.0.1</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>com.nimbusds</groupId> -+ <artifactId>nimbus-jose-jwt</artifactId> -+ <version>3.9</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>com.squareup.okhttp</groupId> -+ <artifactId>okhttp</artifactId> -+ <version>2.4.0</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>com.squareup.okio</groupId> -+ <artifactId>okio</artifactId> -+ <version>1.4.0</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>com.twitter</groupId> -+ <artifactId>hpack</artifactId> -+ <version>0.11.0</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>net.minidev</groupId> -+ <artifactId>json-smart</artifactId> -+ <version>1.1.1</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>de.ruedigermoeller</groupId> -+ <artifactId>fst</artifactId> -+ <version>2.24</version> -+ <!-- versions 2.17+ are ASFv2 though pom says LGPL 2.1 until 2.45+ --> -+ <!-- https://github.com/RuedigerMoeller/fast-serialization/blob/master/LICENSE.md --> -+ <!-- https://github.com/RuedigerMoeller/fast-serialization/commit/526dd4#diff-600376--> -+ -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ -+ <supplement> -+ <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> -+ <groupId>org.objenesis</groupId> -+ <artifactId>objenesis</artifactId> -+ <version>2.1</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ -+ <!-- xercesImpl is necessary when using -Dhadoop.profile=3.0 due to a bug in maven. (last tested with mvn 3.3.9) -+ See HBASE-16712 for more details.--> -+ <supplement> -+ <project> -+ <groupId>xerces</groupId> -+ <artifactId>xercesImpl</artifactId> -+ <version>2.9.1</version> -+ <licenses> -+ <license> -+ <name>Apache License, Version 2.0</name> -+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ -+ - <!-- Permissive licenses that need text in LICENSE --> - <supplement> - <project> -@@ -2065,4 +2248,43 @@ Copyright (c) 2007-2011 The JRuby project - </licenses> - </project> - </supplement> -+ -+ <supplement> -+ <project> -+ <groupId>net.jcip</groupId> -+ <artifactId>jcip-annotations</artifactId> -+ <version>1.0</version> -+ <organization> -+ <name>Brian Goetz and Tim Peierls</name> -+ <url>http://www.jcip.net</url> -+ </organization> -+ <licenses> -+ <license> -+ <name>Creative Commons Attribution License, Version 2.5</name> -+ <url>http://creativecommons.org/licenses/by/2.5</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ <supplement> -+ <project> -+ <groupId>com.google.re2j</groupId> -+ <artifactId>re2j</artifactId> -+ <version>1.0</version> -+ -+ <organization> -+ <name>The Go Authors</name> -+ <url>https://github.com/google/re2j</url> -+ </organization> -+ <licenses> -+ <license> -+ <name>BSD license</name> <!-- the Go license is BDS 3 clause verbatim --> -+ <url>https://github.com/google/re2j/blob/master/LICENSE</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ </project> -+ </supplement> -+ - </supplementalDataModels> --- -2.7.4 - diff --git a/bigtop.bom b/bigtop.bom index 07d29d2..90a7655 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -164,7 +164,7 @@ bigtop { 'hbase' { name = 'hbase' relNotes = 'Apache HBase' - version { base = '1.3.2'; pkg = base; release = 1 } + version { base = '1.5.0'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/${version.base}/"