This is an automated email from the ASF dual-hosted git repository.
zachjsh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new de00f5b3854 Fix various license checks (#18393)
de00f5b3854 is described below
commit de00f5b3854cd2eaf26fec83a558dfe7cce052cb
Author: Andreas Maechler <[email protected]>
AuthorDate: Wed Aug 13 10:13:06 2025 -0600
Fix various license checks (#18393)
* Add some MIT licenses
* Typos and such
* Fix reactive-streams license
* Use correct license key
* Fix YAML format
* Add new license
---
.gitignore | 1 +
dev/license.md | 8 ++------
distribution/bin/check-licenses.py | 3 +++
licenses.yaml | 11 ++++++-----
licenses/bin/reactive-streams.CC0 | 8 --------
licenses/bin/reactive-streams.MIT0 | 7 +++++++
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index 687481e3191..2cb57a437a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ README
.java-version
integration-tests/gen-scripts/
**/bin/
+!licenses/bin/
*.hprof
**/.ipynb_checkpoints/
website/.yarn/
diff --git a/dev/license.md b/dev/license.md
index 17f30c63c9d..5fef6a0dd2b 100644
--- a/dev/license.md
+++ b/dev/license.md
@@ -27,13 +27,11 @@ includes not only Druid itself but also all the
dependencies of Druid, its `LICE
As a result, the contents of those files are different and managed separately
for source code and binary packages.
Please read the sections below to understand how we manage the licenses and
what to update when you want to add new dependencies.
-
### Licenses for source code packages
The licenses for source code packages are maintained _manually_ in [the
`LICENSE` file](https://github.com/apache/druid/blob/master/LICENSE).
The notices can be found in [the `NOTICE`
file`](https://github.com/apache/druid/blob/master/NOTICE) similarly.
-
### Licenses for binary packages
The licenses for binary packages are maintained _automatically_.
@@ -42,7 +40,6 @@ All licenses (for both source code and binary releases)
should be registered in
and
[`generate-binary-notice.py`](https://github.com/apache/druid/blob/master/distribution/bin/generate-binary-notice.py)
will generate the `LICENSE` and `NOTICE` files automatically based on the
registry.
-
### Adding licenses
#### When you adopt source codes from other projects into Druid
@@ -91,11 +88,10 @@ source_paths:
-
processing/src/main/java/org/apache/druid/segment/filter/cnf/CalciteCnfHelper.java
```
-
#### When you add a new library dependency into Druid
This requires you to update the [the `licenses.yaml`
file](https://github.com/apache/druid/blob/master/licenses.yaml).
-For example, to add `aws-java-sdk-core` as a new depdency, you need to add the
following entry.
+For example, to add `aws-java-sdk-core` as a new dependency, you need to add
the following entry.
```yaml
name: AWS SDK for Java
@@ -125,4 +121,4 @@ notice: |
### Updating licenses
When you update the version of existing dependencies, you need to update the
version not only in the `pom.xml` file but
-also in the `licenses.yaml` file.
\ No newline at end of file
+also in the `licenses.yaml` file.
diff --git a/distribution/bin/check-licenses.py
b/distribution/bin/check-licenses.py
index 6690632bd94..5795cd1f959 100755
--- a/distribution/bin/check-licenses.py
+++ b/distribution/bin/check-licenses.py
@@ -308,6 +308,9 @@ def build_compatible_license_names():
compatible_licenses['The MIT License (MIT)'] = 'MIT License'
compatible_licenses['Bouncy Castle Licence'] = 'MIT License'
compatible_licenses['SPDX-License-Identifier: MIT'] = 'MIT License'
+ compatible_licenses['MIT'] = 'MIT License'
+
+ compatible_licenses['MIT-0'] = 'MIT No Attribution'
compatible_licenses['The Go license'] = 'The Go license'
compatible_licenses['Universal Permissive License, Version 1.0'] =
'Universal Permissive License, Version 1.0'
diff --git a/licenses.yaml b/licenses.yaml
index ff8b0d5e5f1..70eb5f3a005 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3887,9 +3887,9 @@ libraries:
name: Reactive Streams
license_category: binary
module: java-core
-license_name: Creative Commons CC0
+license_name: MIT-0
version: 1.0.4
-license_file_path: licenses/bin/reactive-streams.CC0
+license_file_path: licenses/bin/reactive-streams.MIT0
libraries:
- org.reactivestreams: reactive-streams
@@ -4892,10 +4892,11 @@ license_name: Apache License version 2.0
libraries:
- org.apache.kafka: kafka-clients
notices:
- - kafka-clients: 'Apache Kafka Copyright 2019 The Apache Software Foundation.
+ - kafka-clients: |
+ Apache Kafka Copyright 2019 The Apache Software Foundation.
-This distribution has a binary dependency on jersey, which is available under
-the CDDL License. The source code of jersey can be found at
https://github.com/jersey/jersey/.'
+ This distribution has a binary dependency on jersey, which is available
under
+ the CDDL License. The source code of jersey can be found at
https://github.com/jersey/jersey/.
---
diff --git a/licenses/bin/reactive-streams.CC0
b/licenses/bin/reactive-streams.CC0
deleted file mode 100644
index 696f2c0ec2d..00000000000
--- a/licenses/bin/reactive-streams.CC0
+++ /dev/null
@@ -1,8 +0,0 @@
-Licensed under Public Domain (CC0)
-
-To the extent possible under law, the person who associated CC0 with
-this code has waived all copyright and related or neighboring
-rights to this code.
-
-You should have received a copy of the CC0 legalcode along with this
-work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
diff --git a/licenses/bin/reactive-streams.MIT0
b/licenses/bin/reactive-streams.MIT0
new file mode 100644
index 00000000000..d15157a65a7
--- /dev/null
+++ b/licenses/bin/reactive-streams.MIT0
@@ -0,0 +1,7 @@
+MIT No Attribution
+
+Copyright 2014 Reactive Streams
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
