[improve][misc] PIP-472: Migrate from javax.* to jakarta.* APIs

build-logic/conventions/src/main/kotlin/pulsar.client-shade-conventions.gradle.kts

@@ -48,7 +48,7 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
         include(dependency("com.google.re2j:re2j"))
         include(dependency("com.spotify:completable-futures"))
         include(dependency("com.squareup.*:.*"))
-        include(dependency("com.sun.activation:jakarta.activation"))
+        include(dependency("org.eclipse.angus:angus-activation"))
         include(dependency("com.thoughtworks.paranamer:paranamer"))
         include(dependency("com.typesafe.netty:netty-reactive-streams"))
         include(dependency("com.yahoo.datasketches:.*"))
@@ -63,10 +63,9 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
         include(dependency("io.swagger:.*"))
         include(dependency("jakarta.activation:jakarta.activation-api"))
         include(dependency("jakarta.annotation:jakarta.annotation-api"))
+        include(dependency("jakarta.inject:jakarta.inject-api"))
         include(dependency("jakarta.ws.rs:jakarta.ws.rs-api"))
         include(dependency("jakarta.xml.bind:jakarta.xml.bind-api"))
-        include(dependency("javax.ws.rs:.*"))
-        include(dependency("javax.xml.bind:jaxb-api"))
         include(dependency("org.apache.avro:.*"))
         include(dependency("org.apache.bookkeeper:.*"))
         include(dependency("org.apache.commons:commons-compress"))
@@ -136,7 +135,7 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
     relocateWithPrefix(shadePrefix, "com.github.benmanes")
     relocateWithPrefix(shadePrefix, "com.spotify.futures")
     relocateWithPrefix(shadePrefix, "com.squareup")
-    relocateWithPrefix(shadePrefix, "com.sun.activation")
+    relocateWithPrefix(shadePrefix, "org.eclipse.angus")
     relocateWithPrefix(shadePrefix, "com.thoughtworks.paranamer")
     relocateWithPrefix(shadePrefix, "com.typesafe")
     relocateWithPrefix(shadePrefix, "com.yahoo")
@@ -147,11 +146,11 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
     relocateWithPrefix(shadePrefix, "io.prometheus.client")
     relocateWithPrefix(shadePrefix, "io.swagger")
     relocateWithPrefix(shadePrefix, "javassist")
-    relocateWithPrefix(shadePrefix, "javax.activation")
-    relocateWithPrefix(shadePrefix, "javax.annotation")
-    relocateWithPrefix(shadePrefix, "javax.inject")
-    relocateWithPrefix(shadePrefix, "javax.ws")
-    relocateWithPrefix(shadePrefix, "javax.xml.bind")
+    relocateWithPrefix(shadePrefix, "jakarta.activation")
+    relocateWithPrefix(shadePrefix, "jakarta.annotation")
+    relocateWithPrefix(shadePrefix, "jakarta.inject")
+    relocateWithPrefix(shadePrefix, "jakarta.ws.rs")
+    relocateWithPrefix(shadePrefix, "jakarta.xml.bind")
     relocateWithPrefix(shadePrefix, "jersey")
     relocateWithPrefix(shadePrefix, "okio")
     relocateWithPrefix(shadePrefix, "org.aopalliance")

distribution/server/src/assemble/LICENSE.bin.txt

@@ -253,9 +253,9 @@ The Apache Software License, Version 2.0
      - com.fasterxml.jackson.core-jackson-core-2.21.3.jar
      - com.fasterxml.jackson.core-jackson-databind-2.21.3.jar
      - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.21.3.jar
-     - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.21.3.jar
-     - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.21.3.jar
-     - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.21.3.jar
+     - com.fasterxml.jackson.jakarta.rs-jackson-jakarta-rs-base-2.21.3.jar
+     - com.fasterxml.jackson.jakarta.rs-jackson-jakarta-rs-json-provider-2.21.3.jar
+     - com.fasterxml.jackson.module-jackson-module-jakarta-xmlbind-annotations-2.21.3.jar
      - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.21.3.jar
      - com.fasterxml.jackson.datatype-jackson-datatype-jdk8-2.21.3.jar
      - com.fasterxml.jackson.datatype-jackson-datatype-jsr310-2.21.3.jar
@@ -344,7 +344,7 @@ The Apache Software License, Version 2.0
     - io.prometheus-prometheus-metrics-exposition-textformats-1.5.1.jar
     - io.prometheus-prometheus-metrics-model-1.5.1.jar
  * Jakarta Bean Validation API
-    - jakarta.validation-jakarta.validation-api-2.0.2.jar
+    - jakarta.validation-jakarta.validation-api-3.0.2.jar
     - javax.validation-validation-api-1.1.0.Final.jar
  * Log4J
     - org.apache.logging.log4j-log4j-api-2.25.4.jar
@@ -410,25 +410,25 @@ The Apache Software License, Version 2.0
     - org.eclipse.jetty.compression-jetty-compression-gzip-12.1.9.jar
     - org.eclipse.jetty.compression-jetty-compression-server-12.1.9.jar
     - org.eclipse.jetty.ee-jetty-ee-webapp-12.1.9.jar
-    - org.eclipse.jetty.ee8-jetty-ee8-annotations-12.1.9.jar
     - org.eclipse.jetty.ee8-jetty-ee8-nested-12.1.9.jar
-    - org.eclipse.jetty.ee8-jetty-ee8-plus-12.1.9.jar
-    - org.eclipse.jetty.ee8-jetty-ee8-proxy-12.1.9.jar
     - org.eclipse.jetty.ee8-jetty-ee8-security-12.1.9.jar
     - org.eclipse.jetty.ee8-jetty-ee8-servlet-12.1.9.jar
-    - org.eclipse.jetty.ee8-jetty-ee8-servlets-12.1.9.jar
-    - org.eclipse.jetty.ee8-jetty-ee8-webapp-12.1.9.jar
-    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-api-12.1.9.jar
-    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-common-12.1.9.jar
-    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-jetty-server-12.1.9.jar
-    - org.eclipse.jetty.ee8.websocket-jetty-ee8-websocket-servlet-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-annotations-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-plus-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-proxy-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-servlet-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-servlets-12.1.9.jar
+    - org.eclipse.jetty.ee10-jetty-ee10-webapp-12.1.9.jar
+    - org.eclipse.jetty.ee10.websocket-jetty-ee10-websocket-jetty-server-12.1.9.jar
+    - org.eclipse.jetty.ee10.websocket-jetty-ee10-websocket-servlet-12.1.9.jar
     - org.eclipse.jetty.toolchain-jetty-servlet-api-4.0.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-core-client-12.1.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-core-common-12.1.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-core-server-12.1.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-jetty-api-12.1.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-jetty-client-12.1.9.jar
     - org.eclipse.jetty.websocket-jetty-websocket-jetty-common-12.1.9.jar
+    - org.eclipse.jetty.websocket-jetty-websocket-jetty-server-12.1.9.jar
  * SnakeYaml -- org.yaml-snakeyaml-2.0.jar
  * RocksDB - org.rocksdb-rocksdbjni-7.9.2.jar
  * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.45.0.jar
@@ -590,37 +590,43 @@ Protocol Buffers License
    - com.google.protobuf-protobuf-java-util-3.25.5.jar -- ../licenses/LICENSE-protobuf.txt
 
 CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
- * Java Annotations API
-    - com.sun.activation-jakarta.activation-1.2.2.jar
- * Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
+ * Java Servlet API
+    - javax.servlet-javax.servlet-api-3.1.0.jar
+    - jakarta.servlet-jakarta.servlet-api-6.0.0.jar
  * HK2 - Dependency Injection Kernel
-    - org.glassfish.hk2-hk2-api-2.6.1.jar
-    - org.glassfish.hk2-hk2-locator-2.6.1.jar
-    - org.glassfish.hk2-hk2-utils-2.6.1.jar
+    - org.glassfish.hk2-hk2-api-3.0.6.jar
+    - org.glassfish.hk2-hk2-locator-3.0.6.jar
+    - org.glassfish.hk2-hk2-utils-3.0.6.jar
     - org.glassfish.hk2-osgi-resource-locator-1.0.3.jar
-    - org.glassfish.hk2.external-aopalliance-repackaged-2.6.1.jar
+    - org.glassfish.hk2.external-aopalliance-repackaged-3.0.6.jar
  * Jersey
-    - org.glassfish.jersey.containers-jersey-container-servlet-2.42.jar
-    - org.glassfish.jersey.containers-jersey-container-servlet-core-2.42.jar
-    - org.glassfish.jersey.core-jersey-client-2.42.jar
-    - org.glassfish.jersey.core-jersey-common-2.42.jar
-    - org.glassfish.jersey.core-jersey-server-2.42.jar
-    - org.glassfish.jersey.ext-jersey-entity-filtering-2.42.jar
-    - org.glassfish.jersey.media-jersey-media-json-jackson-2.42.jar
-    - org.glassfish.jersey.media-jersey-media-multipart-2.42.jar
-    - org.glassfish.jersey.inject-jersey-hk2-2.42.jar
+    - org.glassfish.jersey.containers-jersey-container-servlet-3.1.10.jar
+    - org.glassfish.jersey.containers-jersey-container-servlet-core-3.1.10.jar
+    - org.glassfish.jersey.core-jersey-client-3.1.10.jar
+    - org.glassfish.jersey.core-jersey-common-3.1.10.jar
+    - org.glassfish.jersey.core-jersey-server-3.1.10.jar
+    - org.glassfish.jersey.ext-jersey-entity-filtering-3.1.10.jar
+    - org.glassfish.jersey.media-jersey-media-json-jackson-3.1.10.jar
+    - org.glassfish.jersey.media-jersey-media-multipart-3.1.10.jar
+    - org.glassfish.jersey.inject-jersey-hk2-3.1.10.jar
  * Mimepull -- org.jvnet.mimepull-mimepull-1.9.15.jar
 
 Eclipse Distribution License 1.0 -- ../licenses/LICENSE-EDL-1.0.txt
  * Jakarta Activation
-    - jakarta.activation-jakarta.activation-api-1.2.2.jar
- * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.jar
+    - jakarta.activation-jakarta.activation-api-2.1.3.jar
+    - org.eclipse.angus-angus-activation-2.0.2.jar
+    - com.sun.activation-jakarta.activation-1.2.2.jar
+ * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-4.0.2.jar
 
 Eclipse Public License - v2.0 -- ../licenses/LICENSE-EPL-2.0.txt
- * Jakarta Annotations API -- jakarta.annotation-jakarta.annotation-api-1.3.5.jar
- * Jakarta RESTful Web Services -- jakarta.ws.rs-jakarta.ws.rs-api-2.1.6.jar
- * Jakarta Injection -- org.glassfish.hk2.external-jakarta.inject-2.6.1.jar
- * Jakarta Transactions API -- jakarta.transaction-jakarta.transaction-api-1.3.3.jar
+ * Jakarta Annotations API -- jakarta.annotation-jakarta.annotation-api-2.1.1.jar
+ * Jakarta RESTful Web Services -- jakarta.ws.rs-jakarta.ws.rs-api-3.1.0.jar
+ * Jakarta Injection -- jakarta.inject-jakarta.inject-api-2.0.1.jar
+ * Jakarta Transactions API -- jakarta.transaction-jakarta.transaction-api-2.0.1.jar
+ * Jakarta CDI API
+    - jakarta.enterprise-jakarta.enterprise.cdi-api-4.0.1.jar
+    - jakarta.enterprise-jakarta.enterprise.lang-model-4.0.1.jar
+ * Jakarta Interceptors API -- jakarta.interceptor-jakarta.interceptor-api-2.1.0.jar
 
 Public Domain (CC0) -- ../licenses/LICENSE-CC0.txt
  * Reactive Streams -- org.reactivestreams-reactive-streams-1.0.4.jar

distribution/shell/src/assemble/LICENSE.bin.txt

@@ -317,9 +317,9 @@ The Apache Software License, Version 2.0
      - jackson-core-2.21.3.jar
      - jackson-databind-2.21.3.jar
      - jackson-dataformat-yaml-2.21.3.jar
-     - jackson-jaxrs-base-2.21.3.jar
-     - jackson-jaxrs-json-provider-2.21.3.jar
-     - jackson-module-jaxb-annotations-2.21.3.jar
+     - jackson-jakarta-rs-base-2.21.3.jar
+     - jackson-jakarta-rs-json-provider-2.21.3.jar
+     - jackson-module-jakarta-xmlbind-annotations-2.21.3.jar
      - jackson-module-jsonSchema-2.21.3.jar
      - jackson-datatype-jdk8-2.21.3.jar
      - jackson-datatype-jsr310-2.21.3.jar
@@ -436,33 +436,33 @@ MIT License
     - slf4j-api-2.0.17.jar
 
 CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
- * Java Annotations API
-    - jakarta.activation-1.2.2.jar
  * HK2 - Dependency Injection Kernel
-    - hk2-api-2.6.1.jar
-    - hk2-locator-2.6.1.jar
-    - hk2-utils-2.6.1.jar
-    - aopalliance-repackaged-2.6.1.jar
+    - hk2-api-3.0.6.jar
+    - hk2-locator-3.0.6.jar
+    - hk2-utils-3.0.6.jar
+    - aopalliance-repackaged-3.0.6.jar
     - osgi-resource-locator-1.0.3.jar
  * Jersey
-    - jersey-client-2.42.jar
-    - jersey-common-2.42.jar
-    - jersey-entity-filtering-2.42.jar
-    - jersey-media-json-jackson-2.42.jar
-    - jersey-media-multipart-2.42.jar
-    - jersey-hk2-2.42.jar
+    - jersey-client-3.1.10.jar
+    - jersey-common-3.1.10.jar
+    - jersey-entity-filtering-3.1.10.jar
+    - jersey-media-json-jackson-3.1.10.jar
+    - jersey-media-multipart-3.1.10.jar
+    - jersey-hk2-3.1.10.jar
  * Mimepull -- mimepull-1.9.15.jar
 
 Eclipse Distribution License 1.0 -- ../licenses/LICENSE-EDL-1.0.txt
  * Jakarta Activation
-    - jakarta.activation-api-1.2.2.jar
+    - jakarta.activation-api-2.1.3.jar
+    - angus-activation-2.0.2.jar
+    - jakarta.activation-1.2.2.jar
     - validation-api-1.1.0.Final.jar
- * Jakarta XML Binding -- jakarta.xml.bind-api-2.3.3.jar
+ * Jakarta XML Binding -- jakarta.xml.bind-api-4.0.2.jar
 
 Eclipse Public License - v2.0 -- ../licenses/LICENSE-EPL-2.0.txt
- * Jakarta Annotations API -- jakarta.annotation-api-1.3.5.jar
- * Jakarta RESTful Web Services -- jakarta.ws.rs-api-2.1.6.jar
- * Jakarta Injection -- jakarta.inject-2.6.1.jar
+ * Jakarta Annotations API -- jakarta.annotation-api-2.1.1.jar
+ * Jakarta RESTful Web Services -- jakarta.ws.rs-api-3.1.0.jar
+ * Jakarta Injection -- jakarta.inject-api-2.0.1.jar
 
 Public Domain (CC0) -- ../licenses/LICENSE-CC0.txt
  * Reactive Streams -- reactive-streams-1.0.4.jar

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ zookeeper = "3.9.5"
 netty = "4.1.134.Final"
 netty-iouring = "0.0.26.Final"
 jetty = "12.1.9"
-jersey = "2.42"
+jersey = "3.1.10"
 jackson = "2.21.3"
 jackson-annotations = "2.21"
 protobuf = "3.25.5"
@@ -112,6 +112,7 @@ audience-annotations = "0.12.0"
 # Misc
 curator = "5.7.1"
 reflections = "0.10.2"
+# swagger stays 1.6.2 in Phase A (javax→jakarta core); migrated to Swagger Core 2.x (io.swagger.core.v3) in Phase B
 swagger = "1.6.2"
 typetools = "0.5.0"
 jna = "5.18.1"
@@ -128,12 +129,18 @@ snappy = "1.1.10.8"
 ipaddress = "5.5.0"
 zt-zip = "1.17"
 # Jakarta
-jakarta-ws-rs = "2.1.6"
-jakarta-annotation = "1.3.5"
-jakarta-activation = "1.2.2"
-jakarta-xml-bind = "2.3.3"
-jakarta-validation = "2.0.2"
+jakarta-ws-rs = "3.1.0"
+jakarta-annotation = "2.1.1"
+jakarta-activation = "2.1.3"
+# Jakarta Activation 2.x reference implementation (the com.sun.activation:jakarta.activation impl was not
+# republished past 2.0.x; Eclipse Angus is the EE10 impl of jakarta.activation-api 2.1.x)
+angus-activation = "2.0.2"
+jakarta-xml-bind = "4.0.2"
+jakarta-validation = "3.0.2"
+# javax-servlet (Servlet 3.1, ee8) is retained alongside jakarta-servlet (Servlet 6.0, ee10)
+# so that the AdditionalServlet plugin SPI keeps supporting legacy javax.servlet handlers (PIP-472)
 javax-servlet = "3.1.0"
+jakarta-servlet = "6.0.0"
 # Oxia / etcd
 oxia = "0.7.4"
 # Build plugins
@@ -195,7 +202,7 @@ jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-dat
 jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 jackson-module-jsonSchema = { module = "com.fasterxml.jackson.module:jackson-module-jsonSchema", version.ref = "jackson" }
-jackson-jaxrs-json-provider = { module = "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", version.ref = "jackson" }
+jackson-jakarta-rs-json-provider = { module = "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider", version.ref = "jackson" }
 # Netty
 netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
 netty-common = { module = "io.netty:netty-common", version.ref = "netty" }
@@ -263,12 +270,18 @@ jetty-alpn-conscrypt-server = { module = "org.eclipse.jetty:jetty-alpn-conscrypt
 jetty-compression-server = { module = "org.eclipse.jetty.compression:jetty-compression-server", version.ref = "jetty" }
 jetty-compression-gzip = { module = "org.eclipse.jetty.compression:jetty-compression-gzip", version.ref = "jetty" }
 jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty" }
+# jetty-ee8-* is retained for the AdditionalServlet legacy javax.servlet environment (PIP-472)
 jetty-ee8-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "jetty" }
 jetty-ee8-servlets = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "jetty" }
 jetty-ee8-proxy = { module = "org.eclipse.jetty.ee8:jetty-ee8-proxy", version.ref = "jetty" }
 jetty-websocket-jetty-api = { module = "org.eclipse.jetty.websocket:jetty-websocket-jetty-api", version.ref = "jetty" }
 jetty-websocket-jetty-client = { module = "org.eclipse.jetty.websocket:jetty-websocket-jetty-client", version.ref = "jetty" }
 jetty-ee8-websocket-jetty-server = { module = "org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server", version.ref = "jetty" }
+# jetty-ee10-* is used by Pulsar's own broker/proxy/websocket Jetty wiring (jakarta.servlet, PIP-472)
+jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
+jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" }
+jetty-ee10-proxy = { module = "org.eclipse.jetty.ee10:jetty-ee10-proxy", version.ref = "jetty" }
+jetty-ee10-websocket-jetty-server = { module = "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server", version.ref = "jetty" }
 # Jersey
 jersey-server = { module = "org.glassfish.jersey.core:jersey-server", version.ref = "jersey" }
 jersey-container-servlet-core = { module = "org.glassfish.jersey.containers:jersey-container-servlet-core", version.ref = "jersey" }
@@ -381,9 +394,18 @@ auth0-jwks-rsa = { module = "com.auth0:jwks-rsa", version.ref = "auth0-jwks-rsa"
 # Jakarta
 jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakarta-ws-rs" }
 jakarta-activation-api = { module = "jakarta.activation:jakarta.activation-api", version.ref = "jakarta-activation" }
-jakarta-activation = { module = "com.sun.activation:jakarta.activation", version.ref = "jakarta-activation" }
+angus-activation = { module = "org.eclipse.angus:angus-activation", version.ref = "angus-activation" }
 jakarta-xml-bind-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jakarta-xml-bind" }
 javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet" }
+jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" }
+# javax.xml.bind:jaxb-api is required at runtime by third-party libraries that still reference the
+# legacy javax.xml.bind API (jclouds and Hadoop in the tiered-storage offloaders); Pulsar's own code
+# uses jakarta.xml.bind (PIP-472)
+jaxb-api = "javax.xml.bind:jaxb-api:2.3.1"
+# javax.ws.rs:javax.ws.rs-api is required at runtime only by Hadoop's MiniDFSCluster web UI in
+# tiered-storage tests; Pulsar's own code uses jakarta.ws.rs (PIP-472)
+javax-ws-rs-api = "javax.ws.rs:javax.ws.rs-api:2.1.1"
+jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version.ref = "jakarta-validation" }
 zt-zip = { module = "org.zeroturnaround:zt-zip", version.ref = "zt-zip" }
 ipaddress = { module = "com.github.seancfoley:ipaddress", version.ref = "ipaddress" }
 # Oxia / etcd

pulsar-broker-auth-sasl/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     implementation(libs.caffeine)
     implementation(libs.commons.lang3)
     implementation(libs.commons.codec)
-    implementation(libs.javax.servlet.api)
+    implementation(libs.jakarta.servlet.api)
     implementation(libs.simpleclient.caffeine)
 
     testImplementation(libs.commons.io)

pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java

@@ -35,6 +35,8 @@
 import static org.apache.pulsar.common.sasl.SaslConstants.SASL_STATE_SERVER_CHECK_TOKEN;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.net.URI;
@@ -49,8 +51,6 @@
 import javax.naming.AuthenticationException;
 import javax.net.ssl.SSLSession;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.CustomLog;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.ServiceConfiguration;