Skip to content
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
2 changes: 1 addition & 1 deletion alluxio/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pulsarConnectorsDependencies {

dependencies {
// Alluxio-compatible BOMs — these override the shared platform versions.
implementation(enforcedPlatform(libs.jetty9.bom))
implementation(enforcedPlatform(libs.jetty9.bom.override))
implementation(enforcedPlatform("io.netty:netty-bom:4.1.100.Final"))
implementation(enforcedPlatform("io.grpc:grpc-bom:1.37.0"))

Expand Down
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,9 @@ curator-recipes = { module = "org.apache.curator:curator-recipes", version.ref =
conscrypt-openjdk-uber = { module = "org.conscrypt:conscrypt-openjdk-uber", version.ref = "conscrypt" }
# Jetty
jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
jetty9-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty9" }
# Override for alluxio: alluxio requires the older jetty 9.x. Aliases ending in
# `-override` are NOT added to the shared `pulsar-connectors-dependencies` platform
jetty9-bom-override = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty9" }
jetty-server = { module = "org.eclipse.jetty:jetty-server" }
jetty-util = { module = "org.eclipse.jetty:jetty-util" }
jetty-alpn-conscrypt-server = { module = "org.eclipse.jetty:jetty-alpn-conscrypt-server" }
Expand Down
5 changes: 5 additions & 0 deletions pulsar-connectors-dependencies/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ dependencies {
// the version we specify, regardless of what version a transitive dependency requests.
// BOM entries (detected by alias name) are imported as platforms rather than constraints.
catalog.libraryAliases.forEach { alias ->
// Skip aliases that are subproject-specific overrides (e.g. jetty9-bom-override).
// These pin the same Maven coordinates to a different version than the shared
// platform — including them here would declare two versions of the same module
// and break consumers (e.g. alluxio uses jetty 9.x while everything else uses 12.x).
if (alias.endsWith(".override")) return@forEach
catalog.findLibrary(alias).ifPresent { provider ->
val dep = provider.get()
if (alias.endsWith(".bom")) {
Expand Down