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

Fix NOTICE and LICENSE in the gcp-bundle jar #12144

Merged
merged 2 commits into from
Feb 6, 2025

Conversation

jbonofre
Copy link
Member

@jbonofre jbonofre commented Jan 31, 2025

This change includes:

  • Update versions in LICENSE and NOTICE
  • Remove opencensus-proto from LICENSE as not found in the runtime classpath and the jar
  • Add io.opentelemetry:* in LICENSE as the classes are in the jar
  • cleanup on ASF projects references
  • Reformat Netty NOTICE
  • Add gRPC NOTICE content
  • Add perfmark NOTICE content
  • Add conscrypt NOTICE content

@jbonofre
Copy link
Member Author

@amogh-jahagirdar @rdblue @Fokko This is the update/fix for gcp-bundle extracted from #12095

@jbonofre jbonofre changed the title Fix NOTICE and LICENSE in gcp-bundle Fix NOTICE and LICENSE in the gcp-bundle jar Jan 31, 2025
gcp-bundle/LICENSE Outdated Show resolved Hide resolved
gcp-bundle/NOTICE Outdated Show resolved Hide resolved
@@ -325,24 +315,24 @@ License: The Apache Software License, Version 2.0 - http://www.apache.org/licens

Copy link
Contributor

@rdblue rdblue Jan 31, 2025

Choose a reason for hiding this comment

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

We need to suppress this and include the stephenc findbugs implementation instead. This one has licensing issues and the stephenc version was built to avoid them. That, or I think if this is only annotations, we can just exclude it. Annotations shouldn't be required at runtime if they are not used at runtime (and these are for compile time).

Copy link
Member Author

Choose a reason for hiding this comment

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

Which one ? Not sure I follow you here 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Findbugs (com.google.code.findbugs) I see some contents from META-INF but no actual classes in the bundle bits

     0 Fri Feb 01 00:00:00 MST 1980 META-INF/maven/com.google.code.findbugs/
     0 Fri Feb 01 00:00:00 MST 1980 META-INF/maven/com.google.code.findbugs/jsr305/
  4286 Fri Feb 01 00:00:00 MST 1980 META-INF/maven/com.google.code.findbugs/jsr305/pom.xml
   121 Fri Feb 01 00:00:00 MST 1980 META-INF/maven/com.google.code.findbugs/jsr305/pom.properties

I'd be +1 on excluding it.

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 what I see as well, but as I still see resources from jsr305 (even if very limited), I preferred to keep it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, since these are compile time could we just exclude the bundling of this dependency entirely in the building of the shadowjar? Then we could just remove it entirely from LICENSE.

exclude(dependency('com.google.code.findbugs:jsr305'))

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 agree. Let me clean it up. Even if gradle keeps pom it's not a problem.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

Choose a reason for hiding this comment

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

The license of findbugs was unclear because of a reference to LGPL (see findbugsproject/findbugs#128). The implementation we use elsewhere was built to avoid the problem: https://github.com/stephenc/findbugs-annotations?tab=readme-ov-file#rational

Copy link
Member Author

Choose a reason for hiding this comment

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

@amogh-jahagirdar I removed the mention of jsr305.

@rdblue thanks for the details (LICENSE/NOTICE is a tricky work and often different view from everyone 😄 ). I removed jsr305 as it's excluded from the gcp-bundle jar.

Copy link
Contributor

@rdblue rdblue left a comment

Choose a reason for hiding this comment

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

Looks mostly good, but I flagged an issue with removing the duplicates (I don't see that they are duplicating anything).

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 think these changes look good now

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.

I think a few are missing from opentelemetry, but apart from that it looks good to me 👍

gcp-bundle/LICENSE Show resolved Hide resolved
gcp-bundle/LICENSE Show resolved Hide resolved
@jbonofre jbonofre force-pushed the notice-fix-gcp-bundle branch from b06855b to 75e0be1 Compare February 4, 2025 14:04
gcp-bundle/LICENSE Outdated Show resolved Hide resolved
@jbonofre jbonofre force-pushed the notice-fix-gcp-bundle branch from 75e0be1 to 4f837d7 Compare February 5, 2025 09:54
@jbonofre jbonofre force-pushed the notice-fix-gcp-bundle branch from 4f837d7 to da79d81 Compare February 5, 2025 09:57
@jbonofre
Copy link
Member Author

jbonofre commented Feb 5, 2025

@rdblue I think I addressed all comments. Can you please do a new pass ? Thanks !

gcp-bundle/LICENSE Outdated Show resolved Hide resolved
Co-authored-by: Fokko Driesprong <[email protected]>
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.

Looks good, thanks again @jbonofre

@Fokko Fokko added this to the Iceberg 1.8.0 milestone Feb 6, 2025
@rdblue rdblue merged commit be0da5a into apache:main Feb 6, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants