Skip to content

MINOR: Update versions in LICENSE/NOTICE #652

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
lidavidm merged 1 commit into from
Mar 6, 2025
Merged

MINOR: Update versions in LICENSE/NOTICE #652

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
8 changes: 4 additions & 4 deletions flight/flight-integration-tests/src/shade/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

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

This binary artifact contains Jackson 2.18.2.
This binary artifact contains Jackson 2.18.3.

Home page: https://github.com/FasterXML/jackson
License: https://www.apache.org/licenses/LICENSE-2.0
Expand All @@ -218,14 +218,14 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Google Flatbuffers 25.1.24.
This binary artifact contains Google Flatbuffers 25.2.10.

Home page: https://flatbuffers.dev/
License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Netty 4.1.117.Final.
This binary artifact contains Netty 4.1.119.Final.

Copyright: Copyright 2014 The Netty Project
Home page: https://netty.io/
Expand Down Expand Up @@ -1097,7 +1097,7 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Slf4j 2.0.16.
This binary artifact contains Slf4j 2.0.17.

Copyright: Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
Home page: http://www.slf4j.org/
Expand Down
2 changes: 1 addition & 1 deletion flight/flight-integration-tests/src/shade/NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).

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

This product includes Netty 4.1.117.Final, with the following in its NOTICE:
This product includes Netty 4.1.119.Final, with the following in its NOTICE:

| The Netty Project
| =================
Expand Down
14 changes: 7 additions & 7 deletions flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Netty 4.1.117.Final.
This binary artifact contains Netty 4.1.119.Final.

Copyright: Copyright 2014 The Netty Project
Home page: https://netty.io/
Expand All @@ -234,7 +234,7 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Protobuf 3.25.3.
This binary artifact contains Protobuf 3.25.5.

Copyright: Copyright 2008 Google Inc. All rights reserved.
Home page: https://protobuf.dev/
Expand Down Expand Up @@ -276,7 +276,7 @@ License text:

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

This binary artifact contains Jackson 2.18.2.
This binary artifact contains Jackson 2.18.3.

Home page: https://github.com/FasterXML/jackson
License: https://www.apache.org/licenses/LICENSE-2.0
Expand All @@ -291,14 +291,14 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Google Flatbuffers 25.1.24.
This binary artifact contains Google Flatbuffers 25.2.10.

Home page: https://flatbuffers.dev/
License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Slf4j 2.0.16.
This binary artifact contains Slf4j 2.0.17.

Copyright: Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
Home page: http://www.slf4j.org/
Expand Down Expand Up @@ -329,7 +329,7 @@ License text:

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

This binary artifact contains Apache Calcite Avatica 1.25.0.
This binary artifact contains Apache Calcite Avatica 1.26.0.

Copyright: Copyright 2012-2024 The Apache Software Foundation
Home page: https://calcite.apache.org/avatica/
Expand All @@ -345,7 +345,7 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Bouncycastle 1.79.
This binary artifact contains Bouncycastle 1.80.

Copyright: Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
Home page: https://www.bouncycastle.org/
Expand Down
2 changes: 1 addition & 1 deletion flight/flight-sql-jdbc-driver/src/shade/NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ This product includes gRPC 1.70.0, with the following in its NOTICE:

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

This product includes Netty 4.1.117.Final, with the following in its NOTICE:
This product includes Netty 4.1.119.Final, with the following in its NOTICE:
Copy link
Member

@kou kou Mar 5, 2025

Choose a reason for hiding this comment

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

It seems that https://github.com/apache/arrow-java/tree/main/flight/flight-sql-jdbc-driver doesn't include copy of part of Netty. Do we need this? (Or should we change this to "This binary artifact contains ..."?)

Copy link
Member Author

@jbonofre jbonofre Mar 5, 2025

Choose a reason for hiding this comment

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

JDBC driver actually shades Netty (using org/apache/arrow/driver/jdbc/shaded relocation).
For instance:

$ jar tvf flight-sql-jdbc-driver-19.0.0-SNAPSHOT.jar|grep -i netty
...
org/apache/arrow/driver/jdbc/shaded/io/netty/handler/codec/http2/Http2FrameLogger$Direction.class
org/apache/arrow/driver/jdbc/shaded/io/netty/handler/codec/http2/Http2Exception$ClosedStreamCreationException.class
org/apache/arrow/driver/jdbc/shaded/io/netty/handler/codec/http2/Http2FrameCodec.class
org/apache/arrow/driver/jdbc/shaded/io/netty/handler/codec/http2/Http2PushPromiseFrame.class
...

Copy link
Member Author

@jbonofre jbonofre Mar 5, 2025

Choose a reason for hiding this comment

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

https://github.com/apache/arrow-java/blob/main/flight/flight-sql-jdbc-driver/pom.xml#L120

Copy link
Member

@kou kou Mar 5, 2025

Choose a reason for hiding this comment

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

I'm not familiar with Java but I thought flight-sql-jdbc-driver-19.0.0-SNAPSHOT.jar is a binary artifact not a source archive. (I thought that https://repository.apache.org/content/repositories/staging/org/apache/arrow/flight-sql-jdbc-driver/18.2.0/flight-sql-jdbc-driver-18.2.0-sources.jar is a source archive for flight-sql-jdbc-driver.)

We use "This binary artifact contains ..." in other files for binary artifact and we use "This product includes ..." for copied sources. e.g.:

arrow-java/LICENSE.txt

Line 205 in cf8b252

This product includes code from Netty 4.1.117.Final:

So I thought:

  • We don't need this for source archive?
  • We should use "This binary artifact ..."?

BTW, I noticed that this isn't used for -sources.jar! This is used only for .jar, right?

Copy link
Member Author

@jbonofre jbonofre Mar 5, 2025

Choose a reason for hiding this comment

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

We have to ship LICENSE and NOTICE in the jar. That's why these files are in the shaded folder. And LICENSE has to list of dependencies shaded/shipped in the distributed artifact.


| The Netty Project
| =================
Expand Down
10 changes: 5 additions & 5 deletions tools/src/shade/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@

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

This binary artifact contains Netty 4.1.117.Final.
This binary artifact contains Netty 4.1.119.Final.

Copyright: Copyright 2014 The Netty Project
Home page: https://netty.io/
License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Jackson 2.18.2.
This binary artifact contains Jackson 2.18.3.

Home page: https://github.com/FasterXML/jackson
License: https://www.apache.org/licenses/LICENSE-2.0
Expand Down Expand Up @@ -250,7 +250,7 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Luben Zstd 1.5.6-9.
This binary artifact contains Luben Zstd 1.5.7-1.

Copyright: Copyright (c) 2015-present, Luben Karavelov/ All rights reserved.
Home page: https://github.com/luben/zstd-jni
Expand Down Expand Up @@ -294,14 +294,14 @@ License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Google Flatbuffers 25.1.24.
This binary artifact contains Google Flatbuffers 25.2.10.

Home page: https://flatbuffers.dev/
License: https://www.apache.org/licenses/LICENSE-2.0

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

This binary artifact contains Slf4j 2.0.16.
This binary artifact contains Slf4j 2.0.17.

Copyright: Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
Home page: http://www.slf4j.org/
Expand Down
2 changes: 1 addition & 1 deletion tools/src/shade/NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).

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

This product includes Netty 4.1.117.Final, with the following in its NOTICE:
This product includes Netty 4.1.119.Final, with the following in its NOTICE:

| The Netty Project
| =================
Expand Down
2 changes: 1 addition & 1 deletion vector/src/shade/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

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

This binary artifact contains Google Flatbuffers 25.1.24.
This binary artifact contains Google Flatbuffers 25.2.10.

Home page: https://flatbuffers.dev/
License: https://www.apache.org/licenses/LICENSE-2.0
Loading