bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject bigtop git commit: BIGTOP-3064: Bump HBase to 1.3.2
Date Sun, 26 Aug 2018 17:27:27 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 94d012846 -> b99d05704


BIGTOP-3064: Bump HBase to 1.3.2

HBase 1.3.1 is released on Apr 7, 2017,
while has latest release on 1.3.x is 1.3.2, on Mar 19, 2018.
Bump Hbase to 1.3.2 for bigtop 1.3 release.

Change-Id: Iaca7a4918023c62b56fb6e6462cdd6b2c3a8302e
Signed-off-by: Yuqi Gu <yuqi.gu@arm.com>
Signed-off-by: Evans Ye <evansye@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b99d0570
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b99d0570
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b99d0570

Branch: refs/heads/master
Commit: b99d05704c206ebf72249950346f1b9ef89918cf
Parents: 94d0128
Author: Yuqi Gu <yuqi.gu@arm.com>
Authored: Fri Aug 17 05:12:18 2018 +0000
Committer: Evans Ye <evansye@apache.org>
Committed: Mon Aug 27 01:26:12 2018 +0800

----------------------------------------------------------------------
 .../src/common/hbase/do-component-build         |  2 +-
 ...1-Partial-backport-HBASE-16712-to-1.3.1.diff | 60 --------------------
 .../src/common/hbase/patch1-jasper-scope.diff   | 52 -----------------
 .../src/common/hbase/patch3-HBASE-17352.diff    | 13 -----
 bigtop.bom                                      |  2 +-
 5 files changed, 2 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b99d0570/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index 4b69afb..70b83cf 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -18,7 +18,7 @@ set -ex
 
 . `dirname $0`/bigtop.bom
 
-export MAVEN_OPTS="-Xmx512m"
+export MAVEN_OPTS="-Xmx1024m"
 
 if [ "${BIGTOP_JDK:=8}" == "8" ]; then
     MAVEN_ADDITIONAL="-Dadditionalparam=-Xdoclint:none"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b99d0570/bigtop-packages/src/common/hbase/patch1-0001-Partial-backport-HBASE-16712-to-1.3.1.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/patch1-0001-Partial-backport-HBASE-16712-to-1.3.1.diff
b/bigtop-packages/src/common/hbase/patch1-0001-Partial-backport-HBASE-16712-to-1.3.1.diff
deleted file mode 100644
index ed79b35..0000000
--- a/bigtop-packages/src/common/hbase/patch1-0001-Partial-backport-HBASE-16712-to-1.3.1.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7e3b1d7f830b6e6abd5c4ee6a775f4063b648b60 Mon Sep 17 00:00:00 2001
-From: Anton Chevychalov <pub@mnu.pp.ru>
-Date: Fri, 8 Sep 2017 19:09:23 +0300
-Subject: [PATCH 1/2] Partial backport HBASE-16712 to 1.3.1
-
-That partial backport should fix net:jcip package licence trouble
-when we are building hbase with Hadoop 2.8.x
-
-https://issues.apache.org/jira/browse/HBASE-17893?focusedCommentId=15963617
-https://issues.apache.org/jira/browse/HBASE-16712
----
- .../src/main/resources/META-INF/LICENSE.vm             |  4 +++-
- .../src/main/resources/supplemental-models.xml         | 18 ++++++++++++++++++
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
-index f403c89..0a4a23e 100644
---- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
-+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
-@@ -1561,7 +1561,9 @@ You can redistribute it and/or modify it under either the terms of
the GPL
- ## Whitelist of licenses that it's safe to not aggregate as above.
- ## Note that this doesn't include ALv2 or the aforementioned aggregate
- ## license mentions.
--#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla
Public License Version 2.0' ])
-+##
-+## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
-+#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla
Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5', 'MPL 1.1'])
- ## include LICENSE sections for anything not under ASL2.0
- #foreach( ${dep} in ${projects} )
- #if(${debug-print-included-work-info.equalsIgnoreCase("true")})
-diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
-index d6237d0..d5495cb 100644
---- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
-+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
-@@ -2047,4 +2047,22 @@ 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>
- </supplementalDataModels>
--- 
-2.7.4
-

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b99d0570/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff b/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff
deleted file mode 100644
index d3c53ec..0000000
--- a/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-From 05ba85017ca12c71995b3d65a7690c0a1f861919 Mon Sep 17 00:00:00 2001
-From: Peter Somogyi <psomogyi@cloudera.com>
-Date: Sun, 26 Nov 2017 12:35:57 +0100
-Subject: [PATCH] HBASE-19188 Build fails on branch-1 using maven-3.5.2
-
-Changing tomcat:jasper-runtime scope to compile in
-hbase-server, hbase-rest and hbase-thrift
----
- hbase-rest/pom.xml   | 1 +
- hbase-server/pom.xml | 1 +
- hbase-thrift/pom.xml | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
-index e85407c7e2..806f8055e0 100644
---- a/hbase-rest/pom.xml
-+++ b/hbase-rest/pom.xml
-@@ -243,6 +243,7 @@
-     <dependency>
-       <groupId>tomcat</groupId>
-       <artifactId>jasper-runtime</artifactId>
-+      <scope>compile</scope>
-     </dependency>
-     <!-- REST dependencies -->
-     <dependency>
-diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
-index 81e529f4f7..d3abf213e7 100644
---- a/hbase-server/pom.xml
-+++ b/hbase-server/pom.xml
-@@ -536,6 +536,7 @@
-     <dependency>
-       <groupId>tomcat</groupId>
-       <artifactId>jasper-runtime</artifactId>
-+      <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.jamon</groupId>
-diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
-index 2987fdd824..957d644fdf 100644
---- a/hbase-thrift/pom.xml
-+++ b/hbase-thrift/pom.xml
-@@ -329,6 +329,7 @@
-     <dependency>
-       <groupId>tomcat</groupId>
-       <artifactId>jasper-runtime</artifactId>
-+      <scope>compile</scope>
-     </dependency>
-   </dependencies>
- 
--- 
-2.15.0
-

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b99d0570/bigtop-packages/src/common/hbase/patch3-HBASE-17352.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/patch3-HBASE-17352.diff b/bigtop-packages/src/common/hbase/patch3-HBASE-17352.diff
deleted file mode 100644
index aed179b..0000000
--- a/bigtop-packages/src/common/hbase/patch3-HBASE-17352.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
-index 185e681..b9d8dcc 100644
---- a/hbase-assembly/pom.xml
-+++ b/hbase-assembly/pom.xml
-@@ -138,7 +138,7 @@
-                 <argument>bash</argument>
-                 <argument>-c</argument>
-                 <argument>cat maven-shared-archive-resources/META-INF/NOTICE \
--                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`
\
-+                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`
-                 </argument>
-               </arguments>
-               <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b99d0570/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index a3ab032..231ad19 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -165,7 +165,7 @@ bigtop {
     'hbase' {
       name    = 'hbase'
       relNotes = 'Apache HBase'
-      version { base = '1.3.1'; pkg = base; release = 1 }
+      version { base = '1.3.2'; pkg = base; release = 1 }
       tarball { destination = "${name}-${version.base}.tar.gz"
                 source      = "${name}-${version.base}-src.tar.gz" }
       url     { download_path = "/$name/${version.base}/"


Mime
View raw message