You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2021/04/27 16:05:36 UTC
[hbase] branch branch-2 updated: HBASE-25792 Filter out
o.a.hadoop.thirdparty building shaded jars (#3184)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 04c30bd HBASE-25792 Filter out o.a.hadoop.thirdparty building shaded jars (#3184)
04c30bd is described below
commit 04c30bda8834ab1dbd39d8fdaf36deab7001da92
Author: stack <st...@apache.org>
AuthorDate: Tue Apr 27 08:41:15 2021 -0700
HBASE-25792 Filter out o.a.hadoop.thirdparty building shaded jars (#3184)
Need to add to allowed-licenses list too....
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
Reviewed-by: Duo Zhang <zh...@apache.org>
Reviewed-by: Nick Dimiduk <nd...@apache.org>
---
hbase-mapreduce/pom.xml | 5 ++---
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +-
hbase-server/pom.xml | 3 +--
hbase-shaded/pom.xml | 2 ++
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index ad96fba..52fd92f 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -51,9 +51,8 @@
<configuration>
<archive>
<manifest>
- <!--Include the Driver class as the 'main'.
- Executing the jar will then show a list of the basic MR jobs.
- -->
+ <!--Include the Driver class as the 'main'. Executing the jar will then show a
+ list of the basic MR jobs.-->
<mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
</manifest>
</archive>
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 760208f..ac7c4a7 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
##
## NB: This list is later compared as lower-case. New entries must also be all lower-case
-#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5' ])
+#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0' ])
## include LICENSE sections for anything not under ASL2.0
#foreach( ${dep} in ${projects} )
## if there are no licenses we'll fail the build later, so
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 48a9fbc..b0ee3e7 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -36,8 +36,7 @@
<license.bundles.jquery>true</license.bundles.jquery>
</properties>
<build>
- <!-- Make sure resources get added before they are processed
- by placing this first
+ <!-- Make sure resources get added before they are processed by placing this first
-->
<resources>
<!-- Add the build webabpps to the classpth -->
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 4b7036d..cc91770 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -514,6 +514,8 @@
<!-- We already concat NOTICE, safe to drop individual ones -->
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
+ <!-- Remove the shaded guava added in hadoop-3.3.1+-->
+ <exclude>org/apache/hadoop/thirdparty/**/*</exclude>
</excludes>
</filter>
<filter>