Skip to content

license.yaml fixes for code introduced related to AWS RDS token based password provider in PR #9518 #10885

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

Merged
jihoonson merged 3 commits into from
Mar 10, 2021
Merged

license.yaml fixes for code introduced related to AWS RDS token based password provider in PR #9518 #10885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ee003c
license.yaml fixes for code introduced related to AWS RDS token based…
himanshug Feb 12, 2021
0a7c91f
add notice for commons-dbcp in license file
himanshug Feb 16, 2021
0074ac9
add version and update NOTICE file
himanshug Mar 5, 2021
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
8 changes: 8 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ Copyright 2011-2017 Metamarkets Group Inc.
extendedset
Copyright 2012 Metamarkets Group Inc.

================= Apache Commons DBCP2 2.0.1 =================

Apache Commons DBCP
Copyright 2001-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

-------------------------------------------------------------------------------

This library contains a modified version of Alessandro Colantonio's CONCISE
Expand Down
18 changes: 17 additions & 1 deletion licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ source_paths:
---

name: AWS RDS SDK for Java
license_category: source
license_category: binary
module: extensions/druid-aws-rds-extensions
license_name: Apache License version 2.0
version: 1.11.884
Expand All @@ -157,6 +157,22 @@ libraries:

---

name: Code adopted from org.apache.commons.dbcp2.BasicDataSource
license_category: source
module: server
license_name: Apache License version 2.0
version: 2.0.1
source_paths:
- server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java
Copy link
Copy Markdown
Contributor

@jihoonson jihoonson Feb 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Can you please add a notice here too? I think the notice of Apache projects should be bubbled up into ours. See https://infra.apache.org/licensing-howto.html for more details. The notice for commons-dbcp can be found in https://github.com/apache/commons-dbcp/blob/master/NOTICE.txt.

Copy link
Copy Markdown
Contributor Author

@himanshug himanshug Feb 16, 2021

Choose a reason for hiding this comment

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

updated, thanks for the pointers, really appreciate it as I am somewhat of a noob in my understanding of all contents in license file and just getting by with the most powerful tool there is i.e. the copy-and-paste :)

Copy link
Copy Markdown
Contributor

@jihoonson jihoonson Feb 17, 2021

Choose a reason for hiding this comment

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

Since it's been long to update this source license, the update process was not clear to me as well. I wrote some in #10894. Based on the instructions in that PR, you need to update the LICENSE and NOTICE files for source code packages as well since they are currently managed manually. Also, the CI failure seems legit as the version is missing here.

=== Generating the contents of NOTICE.BINARY file ===

/home/travis/build/apache/druid/distribution/bin/generate-binary-notice.py:60: YAMLLoadWarning: calling yaml.load_all() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details.
  dependencies = list(yaml.load_all(registry_file))

Traceback (most recent call last):
  File "/home/travis/build/apache/druid/distribution/bin/generate-binary-notice.py", line 88, in <module>
    generate_notice(source_notice, dependencies_yaml)
  File "/home/travis/build/apache/druid/distribution/bin/generate-binary-notice.py", line 72, in generate_notice
    print_notice(dependency)
  File "/home/travis/build/apache/druid/distribution/bin/generate-binary-notice.py", line 40, in print_notice
    print_outfile("{} {} {} {}".format(dependencyHeaderLine, dependency['name'], dependency['version'], dependencyHeaderLine))
KeyError: 'version'

Copy link
Copy Markdown
Contributor Author

@himanshug himanshug Mar 9, 2021

Choose a reason for hiding this comment

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

thanks for the pointers. I think I have updated all things now.

notice: |
Apache Commons DBCP
Copyright 2001-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

---

name: LDAP string encoding function from OWASP ESAPI
license_category: source
module: extensions/druid-basic-security
Expand Down