Skip to content

Commit 2382f68

Browse files
authored
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 <[email protected]> Reviewed-by: Duo Zhang <[email protected]> Reviewed-by: Nick Dimiduk <[email protected]>
1 parent 8856f61 commit 2382f68

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

hbase-mapreduce/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@
5151
<configuration>
5252
<archive>
5353
<manifest>
54-
<!--Include the Driver class as the 'main'.
55-
Executing the jar will then show a list of the basic MR jobs.
56-
-->
54+
<!--Include the Driver class as the 'main'. Executing the jar will then show a
55+
list of the basic MR jobs.-->
5756
<mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
5857
</manifest>
5958
</archive>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
13431343
## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
13441344
##
13451345
## NB: This list is later compared as lower-case. New entries must also be all lower-case
1346-
#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' ])
1346+
#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' ])
13471347
## include LICENSE sections for anything not under ASL2.0
13481348
#foreach( ${dep} in ${projects} )
13491349
## if there are no licenses we'll fail the build later, so

hbase-server/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<license.bundles.jquery>true</license.bundles.jquery>
3737
</properties>
3838
<build>
39-
<!-- Make sure resources get added before they are processed
40-
by placing this first
39+
<!-- Make sure resources get added before they are processed by placing this first
4140
-->
4241
<resources>
4342
<!-- Add the build webabpps to the classpth -->

hbase-shaded/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,8 @@
520520
<!-- We already concat NOTICE, safe to drop individual ones -->
521521
<exclude>LICENSE</exclude>
522522
<exclude>NOTICE</exclude>
523+
<!-- Remove the shaded guava added in hadoop-3.3.1+-->
524+
<exclude>org/apache/hadoop/thirdparty/**/*</exclude>
523525
</excludes>
524526
</filter>
525527
<filter>

0 commit comments

Comments
 (0)