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.

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

Add relevant NOTICE portions from ALv2 bundled dependencies #12095

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

jbonofre
Copy link
Member

Bundle jar files actually bundle a few ALv2 dependencies. These dependencies are correctly listed in the LICENSE file, but the NOTICE file don't contain relevant portions when the dependency provides a NOTICE.
I think it would be great to have both copyright and modified code from the dependencies in the NOTICE.

@Fokko @rdblue thoughts ?

Copy link
Contributor

@Fokko Fokko left a comment

Choose a reason for hiding this comment

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

Thanks @jbonofre for cleaning this up! 🙌 I left some comments

Copyright 2017-2025 The Apache Software Foundation

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

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

NOTICE for Group: commons-codec Name: commons-codec Version: 1.17.1
Apache HttpComponents Client
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

@jbonofre jbonofre Jan 28, 2025

Choose a reason for hiding this comment

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

We should copy "relevant" section of the NOTICE. If you go to the NOTICE in the correct version (https://github.com/apache/httpcomponents-client/blob/rel/v4.5.13/NOTICE.txt) bundled (according to :dependencies), it's good there.

aws-bundle/NOTICE Outdated Show resolved Hide resolved
aws-bundle/NOTICE Outdated Show resolved Hide resolved
aws-bundle/NOTICE Outdated Show resolved Hide resolved
azure-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Show resolved Hide resolved
gcp-bundle/NOTICE Show resolved Hide resolved
aws-bundle/NOTICE Outdated Show resolved Hide resolved
Copy link
Contributor

@amogh-jahagirdar amogh-jahagirdar left a comment

Choose a reason for hiding this comment

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

Thanks @jbonofre , I had to go through https://infra.apache.org/licensing-howto.htm a few times but these changes seem right to me now. I'll wait for @rdblue @Fokko input , especially since we need to make sure this is correct for the release.

@jbonofre jbonofre force-pushed the notice-fix branch 3 times, most recently from fc5395d to b88d315 Compare January 29, 2025 16:11
@github-actions github-actions bot added the flink label Jan 29, 2025
@jbonofre
Copy link
Member Author

@amogh-jahagirdar @rdblue @Fokko I fixed the versions in the bundle jar files. I added fixed on flink-runtime. I'm checking/updating LICENSE/NOTICE in spark-runtime now.

This binary artifact includes Apache Parquet 1.15.0 with the following in its NOTICE file:

Copy link
Contributor

@amogh-jahagirdar amogh-jahagirdar Jan 29, 2025

Choose a reason for hiding this comment

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

Do we need to do the same update for the older Flink versions?

Copy link
Member Author

Choose a reason for hiding this comment

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

I propose to do a pass on latest versions (for Flink and Spark), and if we are all good with the changes, I will check deps versions in previous Flink/Spark versions.

Does it work for you ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure! I just wanted to make sure we didn't forget

@jbonofre
Copy link
Member Author

FYI, I checked/fixed/updates spark-runtime LICENSE and NOTICE.

|
| C JSON parsing provided by Jansson and
| written by Petri Lehtinen. The original software is
|available from http://www.digip.org/jansson/.
Copy link
Contributor

Choose a reason for hiding this comment

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

nit space before available

This binary artifact includes Apache Parquet 1.15.0 with the following in its NOTICE file:

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure! I just wanted to make sure we didn't forget

Comment on lines +122 to +134
|| Copyright 2013 Cloudera Inc.
||
|| Licensed under the Apache License, Version 2.0 (the "License");
|| you may not use this file except in compliance with the License.
|| You may obtain a copy of the License at
||
|| http://www.apache.org/licenses/LICENSE-2.0
||
|| Unless required by applicable law or agreed to in writing, software
|| distributed under the License is distributed on an "AS IS" BASIS,
|| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|| See the License for the specific language governing permissions and
|| limitations under the License.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the formatting is a bit off with the double |

|
|| Copyright 2016 Netflix, Inc.
||
|| Licensed under the Apache License, Version 2.0 (the "License");
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above


This binary artifact contains Caffeine by Ben Manes.

Group: com.github.ben-names.caffeine Name: caffeine Version: 3.0.5
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm seeing 2.9.3 in the runtimeClasspath for this dependency?

Comment on lines +418 to +420
Group: com.google.flatbuffers Name: flatbuffers-java Version: 23.5.26
Copyright: 2013-2020 Google Inc.
Home page: https://google.github.io/flatbuffers/
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this actually bundled in the release? I know our LICENSE mentioned it prior to this change but it looks like this is part of the test runtime.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes it's in the jar (I checked the deps in the jar directly).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants