This is an automated email from the ASF dual-hosted git repository.

nodece pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-connectors.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d09baa  [fix][build] Fix the Jetty 9 bom override solution for 
Alluxio plugin (#19)
6d09baa is described below

commit 6d09baa6f20fc8237f7cda035f03561af82cca3b
Author: Lari Hotari <[email protected]>
AuthorDate: Wed Apr 29 13:09:28 2026 +0300

    [fix][build] Fix the Jetty 9 bom override solution for Alluxio plugin (#19)
---
 alluxio/build.gradle.kts                        | 2 +-
 gradle/libs.versions.toml                       | 4 +++-
 pulsar-connectors-dependencies/build.gradle.kts | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/alluxio/build.gradle.kts b/alluxio/build.gradle.kts
index 9d2be5b..5ce659f 100644
--- a/alluxio/build.gradle.kts
+++ b/alluxio/build.gradle.kts
@@ -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"))
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index caa2f98..612d6c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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" }
diff --git a/pulsar-connectors-dependencies/build.gradle.kts 
b/pulsar-connectors-dependencies/build.gradle.kts
index 0be83b0..32fa5fb 100644
--- a/pulsar-connectors-dependencies/build.gradle.kts
+++ b/pulsar-connectors-dependencies/build.gradle.kts
@@ -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")) {

Reply via email to