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

Upgrade Hadoop and Dropwizard versions and exclude non-Apache compliant transitive dependencies #519

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#

[versions]
hadoop = "3.4.0"
hadoop = "3.4.1"
iceberg = "1.7.1"
dropwizard = "4.0.8"
slf4j = "2.0.13"
dropwizard = "4.0.11"
slf4j = "2.0.16"
swagger = "1.6.14"

[bundles]
Expand Down
5 changes: 5 additions & 0 deletions polaris-service/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ dependencies {
exclude("ch.qos.reload4j", "reload4j")
exclude("log4j", "log4j")
exclude("org.apache.zookeeper", "zookeeper")
exclude("org.apache.hadoop.thirdparty", "hadoop-shaded-protobuf_3_25")
Copy link
Member

Choose a reason for hiding this comment

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

Can these be removed from the LICENSE* files then?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's not in the LICENSE file.

Copy link
Member Author

Choose a reason for hiding this comment

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

This transitive is introduced by Hadoop update.

Copy link
Member

Choose a reason for hiding this comment

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

The other three as well?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, the others dependencies are coming also from hadoop for ages. I exclude these dependencies (old jersey version) because they are GPL dependencies (not ASF compliant).

Copy link
Member Author

Choose a reason for hiding this comment

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

The "old" jersey dependencies are removed from the LICENSE.bin file in the other PR.

Copy link
Member Author

@jbonofre jbonofre Dec 10, 2024

Choose a reason for hiding this comment

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

@snazy do you prefer I just do the update in this PR and cleanup transitive dependencies in #495 ?

Copy link
Member

Choose a reason for hiding this comment

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

I don't mind in which PR its done, so +1

exclude("com.github.pjfanning", "jersey-json")
exclude("com.sun.jersey", "jersey-core")
exclude("com.sun.jersey", "jersey-server")
exclude("com.sun.jersey", "jersey-servlet")
}
implementation(libs.hadoop.hdfs.client)
implementation(libs.smallrye.common.annotation)
Expand Down
Loading