You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/05/06 03:23:15 UTC
[hbase] branch branch-2.1 updated (443da32 -> 19042a9)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 443da32 HBASE-22359 Backport of HBASE-21371 misses activation-api license information
new c844660 HBASE-22268 Exclude javax.activation coming from Hadoop 3.2+ from shaded artifacts
new 9f81282 HBASE-22222 Site build fails after hbase-thirdparty upgrade
new 9110121 HBASE-22312 Hadoop 3 profile for hbase-shaded-mapreduce should list mapreduce as a provided dependency
new f20d76d HBASE-22314 shaded byo-hadoop client should list needed hadoop modules as provided scope to avoid inclusion of unnecessary transitive depednencies
new 8a472ea HBASE-22109 Update hbase shaded client for new transitive dependencies of guava after hadoop update
new 19042a9 HBASE-22087 Update LICENSE/shading for the dependencies from the latest Hadoop trunk.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/supplemental-models.xml | 37 ++++++++++++++
.../hbase-shaded-client-byo-hadoop/pom.xml | 58 ++++++++++++++++++++++
hbase-shaded/hbase-shaded-client/pom.xml | 2 +
hbase-shaded/hbase-shaded-mapreduce/pom.xml | 11 ++++
hbase-shaded/pom.xml | 29 ++++++++++-
5 files changed, 135 insertions(+), 2 deletions(-)
[hbase] 03/06: HBASE-22312 Hadoop 3 profile for
hbase-shaded-mapreduce should list mapreduce as a provided dependency
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 91101213f48fd0cbcae338227406a27782b197a0
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Thu Apr 25 10:21:39 2019 -0500
HBASE-22312 Hadoop 3 profile for hbase-shaded-mapreduce should list mapreduce as a provided dependency
(cherry picked from commit cb0bbcbab390cba7a0933e58aa3bf79a334f529b)
---
hbase-shaded/hbase-shaded-mapreduce/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 6aeb2a3..b5e6ecd 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -308,6 +308,17 @@
<artifactId>hadoop-auth</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</profile>
</profiles>
[hbase] 04/06: HBASE-22314 shaded byo-hadoop client should list
needed hadoop modules as provided scope to avoid inclusion of unnecessary
transitive depednencies
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit f20d76df0c2775cebc236f315723e8e524560751
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Thu Apr 25 11:03:37 2019 -0500
HBASE-22314 shaded byo-hadoop client should list needed hadoop modules as provided scope to avoid inclusion of unnecessary transitive depednencies
(cherry picked from commit 87550bf963bfb29f114945370656aef554c3c0f8)
---
.../hbase-shaded-client-byo-hadoop/pom.xml | 58 ++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
index 22f4a7f..ea79142 100644
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
+++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
@@ -58,4 +58,62 @@
</dependency>
</dependencies>
+ <profiles>
+ <!-- These hadoop profiles should be derived from those in the hbase-client
+ module. Essentially, you must list the same hadoop-* dependencies
+ so provided dependencies will not be transitively included.
+ -->
+ <profile>
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h2--><name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ profile for building against Hadoop 3.0.x. Activate using:
+ mvn -Dhadoop.profile=3.0
+ -->
+ <profile>
+ <id>hadoop-3.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>3.0</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
[hbase] 06/06: HBASE-22087 Update LICENSE/shading for the
dependencies from the latest Hadoop trunk.
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 19042a923c3808ccca36914b41aed8cf97e5241f
Author: Wei-Chiu Chuang <we...@cloudera.com>
AuthorDate: Mon Mar 25 11:58:47 2019 +0100
HBASE-22087 Update LICENSE/shading for the dependencies from the latest Hadoop trunk.
When building with latest hadoop:
* JLine is now in the assembly so update licensing
* shaded client w/hadoop needs relocation for a couple new hadoop transitives
Co-authored-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit 962585d376edccc8f4cfa311eee9fba7266f63c8)
---
.../src/main/resources/supplemental-models.xml | 18 ++++++++++++++++++
hbase-shaded/pom.xml | 19 +++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 8e045f2..c326986 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2059,6 +2059,24 @@ Copyright 2010 FasterXML.com
</supplement>
<supplement>
+ <project> <!-- hadoop.profile=3.0 from hadoop-3.3.0 -->
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>3.9.0</version>
+ <licenses>
+ <license>
+ <name>BSD license</name>
+ <url>https://opensource.org/licenses/BSD-3-Clause</url>
+ <distribution>repo</distribution>
+ <comments>
+ Copyright (c) 2002-2018, the original author or authors.
+ </comments>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+ <supplement>
<project>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 6207e95..60d28bb 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -208,6 +208,11 @@
<shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
</relocation>
+ <!-- dnsjava -->
+ <relocation>
+ <pattern>org.xbill</pattern>
+ <shadedPattern>${shaded.prefix}.org.xbill</shadedPattern>
+ </relocation>
<!-- netty family -->
<relocation>
@@ -416,6 +421,10 @@
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>${shaded.prefix}.org.apache.commons.codec</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.text</pattern>
+ <shadedPattern>${shaded.prefix}.org.apache.commons.text</shadedPattern>
+ </relocation>
<!-- top level net-->
<relocation>
@@ -453,6 +462,16 @@
</transformer>
</transformers>
<filters>
+ <!-- remove utility classes which are not required from dnsjava -->
+ <filter>
+ <artifact>dnsjava:dnsjava</artifact>
+ <excludes>
+ <exclude>dig*</exclude>
+ <exclude>jnamed*</exclude>
+ <exclude>lookup*</exclude>
+ <exclude>update*</exclude>
+ </excludes>
+ </filter>
<filter>
<!-- this is a signed osgi bundle -->
<artifact>org.eclipse.jetty.orbit:javax.servlet.jsp.jstl</artifact>
[hbase] 02/06: HBASE-22222 Site build fails after hbase-thirdparty
upgrade
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 9f81282f29989e1584a2599f1b053cef7b07bfb3
Author: zhangduo <zh...@apache.org>
AuthorDate: Sat Apr 13 21:50:59 2019 +0800
HBASE-22222 Site build fails after hbase-thirdparty upgrade
(with addendum)
Signed-off-by: Guanghao Zhang <zg...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit 1e821aa9ce7ccfe2a6657f9297643eba7d6a7547)
(cherry picked from commit 39f2f3acae2c6258c2bab1f8e150c13b962ab351)
---
.../src/main/resources/supplemental-models.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 9e07972..8e045f2 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2974,4 +2974,23 @@ Copyright (c) 2007-2017 The JRuby project
</licenses>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+
+ <organization>
+ <name>Google</name>
+ <url>http://www.google.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <!-- It has been incorrectly called Apache 2.0 in the original pom-->
+ <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>
</supplementalDataModels>
[hbase] 05/06: HBASE-22109 Update hbase shaded client for new
transitive dependencies of guava after hadoop update
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8a472eae665c3fabf9e074a2698d0f48ce9c346f
Author: Gabor Bota <ga...@cloudera.com>
AuthorDate: Tue Mar 26 17:57:25 2019 +0100
HBASE-22109 Update hbase shaded client for new transitive dependencies of guava after hadoop update
* Hadoop updated to Guava 27.0-jre
* Guava 27 adds error checker framework as a transitive dependency
* update relocation rules to relocate it for the shaded client that includes hadoop
Co-authored-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit 5c1af95c0aa8909a1d90635d3763060e01bcb5d0)
---
hbase-shaded/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index ba3d8f5..6207e95 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -227,8 +227,12 @@
<!-- top level org -->
<relocation>
- <pattern>org.codehaus</pattern>
- <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern>
+ <pattern>org.checkerframework</pattern>
+ <shadedPattern>${shaded.prefix}.org.checkerframework</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.codehaus</pattern>
+ <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse</pattern>
[hbase] 01/06: HBASE-22268 Exclude javax.activation coming from
Hadoop 3.2+ from shaded artifacts
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit c844660fef1c143904a785b9ecd5e1e2deafc8ab
Author: Adam Antal <ad...@cloudera.com>
AuthorDate: Thu Apr 18 17:36:55 2019 +0200
HBASE-22268 Exclude javax.activation coming from Hadoop 3.2+ from shaded artifacts
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit ce1a96f2f641f1ba92f8a2b0ccd91381075daa57)
Conflicts:
hbase-shaded/hbase-shaded-client/pom.xml
hbase-shaded/pom.xml
---
hbase-shaded/hbase-shaded-client/pom.xml | 2 ++
hbase-shaded/pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 8b5f699..651d5ad 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -54,6 +54,8 @@
<configuration>
<artifactSet>
<excludes>
+ <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
+ <exclude>javax.activation:javax.activation-api</exclude>
<!--
Tell the shade plugin that in this case we want to include hadoop
by leaving out the exclude.
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index cee6874..ba3d8f5 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -132,6 +132,8 @@
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<excludes>
+ <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
+ <exclude>javax.activation:javax.activation-api</exclude>
<!-- default to excluding Hadoop, have module that want
to include it redefine the exclude list -->
<exclude>org.apache.hadoop:*</exclude>