Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-25792 Filter out o.a.hadoop.thirdparty building shaded jars #3184

Merged
merged 1 commit into from
Apr 27, 2021
Merged

HBASE-25792 Filter out o.a.hadoop.thirdparty building shaded jars #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions hbase-mapreduce/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the past we used hbase-resource-bundle/src/main/resources/supplemental-models.xml file to correct dependency license, like this one https://github.com/apache/hbase/pull/1582/files
either way is fine by me.

## 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
Expand Down
3 changes: 1 addition & 2 deletions hbase-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 2 additions & 0 deletions hbase-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,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>
Expand Down