Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <weichiu@apache.org>
Reviewed-by: Duo Zhang <zhangduo@apache.org>
Reviewed-by: Nick Dimiduk <ndimiduk@apache.org>
This commit is contained in:
stack 2021-04-27 08:41:15 -07:00
parent 01ce44abc4
commit 04c30bda88
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-mapreduce/pom.xml
View File

@ -51,9 +51,8 @@
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<!--Include the Driver class as the 'main'. <!--Include the Driver class as the 'main'. Executing the jar will then show a
Executing the jar will then show a list of the basic MR jobs. list of the basic MR jobs.-->
-->
<mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass> <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
</manifest> </manifest>
</archive> </archive>

2
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
View File

@ -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 ## 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 ## 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 ## include LICENSE sections for anything not under ASL2.0
#foreach( ${dep} in ${projects} ) #foreach( ${dep} in ${projects} )
## if there are no licenses we'll fail the build later, so ## if there are no licenses we'll fail the build later, so

3
hbase-server/pom.xml
View File

@ -36,8 +36,7 @@
<license.bundles.jquery>true</license.bundles.jquery> <license.bundles.jquery>true</license.bundles.jquery>
</properties> </properties>
<build> <build>
<!-- Make sure resources get added before they are processed <!-- Make sure resources get added before they are processed by placing this first
by placing this first
--> -->
<resources> <resources>
<!-- Add the build webabpps to the classpth --> <!-- Add the build webabpps to the classpth -->

2
hbase-shaded/pom.xml
View File

@ -514,6 +514,8 @@
<!-- We already concat NOTICE, safe to drop individual ones --> <!-- We already concat NOTICE, safe to drop individual ones -->
<exclude>LICENSE</exclude> <exclude>LICENSE</exclude>
<exclude>NOTICE</exclude> <exclude>NOTICE</exclude>
<!-- Remove the shaded guava added in hadoop-3.3.1+-->
<exclude>org/apache/hadoop/thirdparty/**/*</exclude>
</excludes> </excludes>
</filter> </filter>
<filter> <filter>