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.

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

[#6375] improvment(catalog-hadoop): Remove protobuf-java to avoid conflict with authorization module #6376

Merged
merged 3 commits into from
Feb 6, 2025
+6 −0
Merged

[#6375] improvment(catalog-hadoop): Remove protobuf-java to avoid conflict with authorization module #6376

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ee62c1
Fix
yuqi1129 Jan 27, 2025
661305a
Resolve comments.
yuqi1129 Feb 5, 2025
e36a36c
Resolve comments.
yuqi1129 Feb 6, 2025
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
5 changes: 5 additions & 0 deletions catalogs/catalog-hadoop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ dependencies {
exclude("org.eclipse.jetty", "*")
exclude("io.netty")
exclude("org.fusesource.leveldbjni")
// Exclude protobuf-java to avoid conflict with;
Copy link
Contributor

Choose a reason for hiding this comment

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

The comment is not complete?

exclude("com.google.protobuf", "protobuf-java")
Copy link
Contributor

Choose a reason for hiding this comment

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

is it still useful as you exclude the package in copy task

Copy link
Contributor

Choose a reason for hiding this comment

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

Is exclude the protobuf-java in copy task is more general solution? since other package may introduce protobuf-java too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm afraid excluding it in the gradle dependencies may be more general.

since other package may introduce protobuf-java too.

Some modules use copy task to exclude jars because using excluding in gradle does not work. I believe this is not a very elegant behaviour.

}
implementation(libs.slf4j.api)
implementation(libs.awaitility)
Expand Down Expand Up @@ -101,6 +103,9 @@ tasks {
exclude("javax.servlet-*.jar")
exclude("kerb-*.jar")
exclude("kerby-*.jar")
// As L55-56 takes no effect actually in the final distribution package, we need to exclude
yuqi1129 marked this conversation as resolved.
Show resolved Hide resolved
// protobuf-java here
exclude("protobuf-java-*.jar")
}
into("$rootDir/distribution/package/catalogs/hadoop/libs")
}
Expand Down
Loading