diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 10899bc0ae7aa..21422a41dcef9 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -571,10 +571,8 @@ Protocol Buffers License
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
- com.sun.activation-javax.activation-1.2.0.jar
- - javax.xml.bind-jaxb-api-2.3.1.jar
* Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
* WebSocket Server API -- javax.websocket-javax.websocket-client-api-1.0.jar
- * Java Web Service REST API -- javax.ws.rs-javax.ws.rs-api-2.1.jar
* HK2 - Dependency Injection Kernel
- org.glassfish.hk2-hk2-api-2.6.1.jar
- org.glassfish.hk2-hk2-locator-2.6.1.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index 07a40d3bc1bc8..a21c272f91b1d 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -431,11 +431,8 @@ MIT License
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
- - javax.annotation-api-1.3.2.jar
- javax.activation-1.2.0.jar
- - jaxb-api-2.3.1.jar
* WebSocket Server API -- javax.websocket-client-api-1.0.jar
- * Java Web Service REST API -- javax.ws.rs-api-2.1.jar
* HK2 - Dependency Injection Kernel
- hk2-api-2.6.1.jar
- hk2-locator-2.6.1.jar
diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml
index 0b79df8278f81..2a5536987cd42 100644
--- a/jetcd-core-shaded/pom.xml
+++ b/jetcd-core-shaded/pom.xml
@@ -45,6 +45,10 @@
io.netty
*
+
+ javax.annotation
+ javax.annotation-api
+
diff --git a/pom.xml b/pom.xml
index 4830358f5ea72..54744a253bb2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@ flexible messaging model and an intuitive client API.
1.10
2.14.0
1.15
- 2.1
+ 2.1.6
2.1.9
3.1.0
2.9.1
@@ -231,7 +231,7 @@ flexible messaging model and an intuitive client API.
2.1.0
3.24.2
1.18.32
- 1.3.2
+ 1.3.5
2.3.1
1.2.0
1.2.2
@@ -854,9 +854,9 @@ flexible messaging model and an intuitive client API.
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api.version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api.version}
@@ -990,6 +990,12 @@ flexible messaging model and an intuitive client API.
com.yahoo.athenz
athenz-zts-java-client-core
${athenz.version}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+
+
@@ -1418,9 +1424,9 @@ flexible messaging model and an intuitive client API.
- javax.annotation
- javax.annotation-api
- ${javax.annotation-api.version}
+ jakarta.annotation
+ jakarta.annotation-api
+ ${jakarta.annotation-api.version}
@@ -1723,11 +1729,6 @@ flexible messaging model and an intuitive client API.
lombok
provided
-
- javax.annotation
- javax.annotation-api
- provided
-
@@ -2003,6 +2004,9 @@ flexible messaging model and an intuitive client API.
src/assemble/LICENSE.bin.txt
src/assemble/NOTICE.bin.txt
+
+ **/META-INF/services/*
+
src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java
diff --git a/pulsar-broker-auth-oidc/pom.xml b/pulsar-broker-auth-oidc/pom.xml
index 72351bf47d288..2d0931c3f2dfe 100644
--- a/pulsar-broker-auth-oidc/pom.xml
+++ b/pulsar-broker-auth-oidc/pom.xml
@@ -95,6 +95,10 @@
bcprov-jdk18on
org.bouncycastle
+
+ javax.annotation
+ javax.annotation-api
+
diff --git a/pulsar-broker-common/pom.xml b/pulsar-broker-common/pom.xml
index 30b703cd78a92..858a234a32dcd 100644
--- a/pulsar-broker-common/pom.xml
+++ b/pulsar-broker-common/pom.xml
@@ -60,8 +60,8 @@
- javax.ws.rs
- javax.ws.rs-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 97ede1f76e969..a34f566447006 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -446,8 +446,8 @@
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
javax.activation
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index ab42f0e2aef59..74ced063fbfd4 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -1,4 +1,4 @@
-
+
-
+
4.0.0
org.apache.pulsar
pulsar
4.1.0-SNAPSHOT
-
pulsar-client-admin
Pulsar Client Admin
-
${project.groupId}
@@ -73,7 +70,6 @@
-
maven-antrun-plugin
@@ -86,15 +82,13 @@
-
+
-
org.apache.maven.plugins
maven-shade-plugin
@@ -107,48 +101,55 @@
true
true
-
- org.apache.pulsar:pulsar-client-original
- org.apache.pulsar:pulsar-client-admin-original
- org.apache.commons:commons-lang3
- commons-codec:commons-codec
- commons-collections:commons-collections
- org.asynchttpclient:*
- org.reactivestreams:reactive-streams
- com.typesafe.netty:netty-reactive-streams
- org.javassist:javassist
- com.google.guava:guava
+ com.fasterxml.jackson.*:*
+ com.google.*:*
+ com.google.auth:*
com.google.code.gson:gson
+ com.google.guava:guava
com.google.re2j:re2j
com.spotify:completable-futures
- com.fasterxml.jackson.*:*
- io.netty:*
- io.netty.incubator:*
- org.apache.pulsar:pulsar-common
- org.apache.bookkeeper:*
+ com.squareup.*:*
+ com.sun.activation:javax.activation
+ com.typesafe.netty:netty-reactive-streams
+ com.yahoo.datasketches:*
com.yahoo.datasketches:sketches-core
- org.glassfish.jersey*:*
- javax.ws.rs:*
- javax.xml.bind:jaxb-api
- jakarta.annotation:*
- org.glassfish.hk2*:*
+ commons-*:*
+ commons-codec:commons-codec
+ commons-collections:commons-collections
+ io.airlift:*
io.grpc:*
+ io.netty.incubator:*
+ io.netty:*
+ io.opencensus:*
io.perfmark:*
- com.yahoo.datasketches:*
- com.squareup.*:*
- com.google.*:*
- commons-*:*
+ io.swagger:*
+ jakarta.activation:jakarta.activation-api
+ jakarta.annotation:jakarta.annotation-api
+ jakarta.ws.rs:jakarta.ws.rs-api
+ jakarta.xml.bind:jakarta.xml.bind-api
+ javax.ws.rs:*
+ javax.xml.bind:jaxb-api
+ net.jcip:jcip-annotations
+ org.apache.bookkeeper:*
+ org.apache.commons:commons-compress
+ org.apache.commons:commons-lang3
+ org.apache.pulsar:pulsar-client-admin-original
+
+ org.apache.pulsar:pulsar-client-messagecrypto-bc
+ org.apache.pulsar:pulsar-client-original
+ org.apache.pulsar:pulsar-common
+ org.asynchttpclient:*
+ org.checkerframework:*
org.eclipse.jetty:*
- com.google.auth:*
+ org.glassfish.hk2*:*
+ org.glassfish.jersey*:*
+ org.javassist:javassist
org.jvnet.mimepull:*
- io.opencensus:*
org.objenesis:*
+ org.reactivestreams:reactive-streams
org.yaml:snakeyaml
- io.swagger:*
-
- org.apache.pulsar:pulsar-client-messagecrypto-bc
com.fasterxml.jackson.core:jackson-annotations
@@ -162,7 +163,7 @@
**
-
+
org/bouncycastle/**
@@ -172,19 +173,54 @@
**
-
+
org/bouncycastle/**
+
+ org.asynchttpclient:async-http-client
+
+ **
+
+
+ org/asynchttpclient/config/ahc-default.properties
+
+
+
+ *:*
+
+ **/module-info.class
+ findbugsExclude.xml
+ META-INF/*-LICENSE
+ META-INF/*-NOTICE
+ META-INF/*.DSA
+ META-INF/*.RSA
+ META-INF/*.SF
+ META-INF/DEPENDENCIES*
+ META-INF/io.netty.versions.properties
+ META-INF/LICENSE*
+ META-INF/license/**
+ META-INF/MANIFEST.MF
+ META-INF/maven/**
+ META-INF/native-image/**
+ META-INF/NOTICE*
+ META-INF/proguard/**
+
+
-
- org.asynchttpclient
- org.apache.pulsar.shade.org.asynchttpclient
+
+
+ (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
+ $1org_apache_pulsar_shade_$3
+ true
- org.apache.commons
- org.apache.pulsar.shade.org.apache.commons
+ com.fasterxml.jackson
+ org.apache.pulsar.shade.com.fasterxml.jackson
+
+ com.fasterxml.jackson.annotation.*
+
com.google
@@ -198,44 +234,61 @@
org.apache.pulsar.shade.com.spotify.futures
- com.fasterxml.jackson
- org.apache.pulsar.shade.com.fasterxml.jackson
-
- com.fasterxml.jackson.annotation.*
-
+ com.squareup
+ org.apache.pulsar.shade.com.squareup
- io.netty
- org.apache.pulsar.shade.io.netty
+ com.sun.activation
+ org.apache.pulsar.shade.com.sun.activation
- org.apache.pulsar.policies
- org.apache.pulsar.shade.org.apache.pulsar.policies
-
-
- org.apache.pulsar.checksum
- org.apache.pulsar.shade.org.apache.pulsar.checksum
+ com.typesafe
+ org.apache.pulsar.shade.com.typesafe
com.yahoo
org.apache.pulsar.shade.com.yahoo
- com.typesafe
- org.apache.pulsar.shade.com.typesafe
+ io.airlift
+ org.apache.pulsar.shade.io.airlift
- org.glassfish
- org.apache.pulsar.shade.org.glassfish
+ io.grpc
+ org.apache.pulsar.shade.io.grpc
- javax.ws
- org.apache.pulsar.shade.javax.ws
+ io.netty
+ org.apache.pulsar.shade.io.netty
+
+
+ io.opencensus
+ org.apache.pulsar.shade.io.opencensus
+
+
+ io.swagger
+ org.apache.pulsar.shade.io.swagger
+
+
+ javassist
+ org.apache.pulsar.shade.javassist
+
+
+ javax.activation
+ org.apache.pulsar.shade.javax.activation
javax.annotation
org.apache.pulsar.shade.javax.annotation
+
+ javax.inject
+ org.apache.pulsar.shade.javax.inject
+
+
+ javax.ws
+ org.apache.pulsar.shade.javax.ws
+
javax.xml.bind
org.apache.pulsar.shade.javax.xml.bind
@@ -245,71 +298,95 @@
org.apache.pulsar.shade.jersey
- org.jvnet
- org.apache.pulsar.shade.org.jvnet
+ META-INF/versions/(\d+)/com/fasterxml/jackson/core/
+ META-INF/versions/$1/org/apache/pulsar/shade/com/fasterxml/jackson/core/
+
+ true
+
+
+ META-INF/versions/(\d+)/javax/xml/bind/
+ META-INF/versions/$1/org/apache/pulsar/shade/javax/xml/bind/
+ true
+
+
+ META-INF/versions/(\d+)/org/glassfish/
+ META-INF/versions/$1/org/apache/pulsar/shade/org/glassfish/
+ true
+
+
+ META-INF/versions/(\d+)/org/yaml/
+ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/
+ true
+
+
+ net.jcip
+ org.apache.pulsar.shade.net.jcip
+
+
+ okio
+ org.apache.pulsar.shade.okio
org.aopalliance
org.apache.pulsar.shade.org.aopalliance
- javassist
- org.apache.pulsar.shade.javassist
+ org.apache.bookkeeper
+ org.apache.pulsar.shade.org.apache.bookkeeper
- javax.inject
- org.apache.pulsar.shade.javax.inject
+ org.apache.commons
+ org.apache.pulsar.shade.org.apache.commons
+
+
+ org.apache.pulsar.checksum
+ org.apache.pulsar.shade.org.apache.pulsar.checksum
+
+
+ org.apache.pulsar.policies
+ org.apache.pulsar.shade.org.apache.pulsar.policies
+
+
+ org.asynchttpclient
+ org.apache.pulsar.shade.org.asynchttpclient
+
+
+ org.checkerframework
+ org.apache.pulsar.shade.org.checkerframework
+
+
+ org.eclipse.jetty
+ org.apache.pulsar.shade.org.eclipse.jetty
+
+
+ org.glassfish
+ org.apache.pulsar.shade.org.glassfish
+
+
+ org.jvnet
+ org.apache.pulsar.shade.org.jvnet
+
+
+ org.objenesis
+ org.apache.pulsar.shade.org.objenesis
org.reactivestreams
org.apache.pulsar.shade.org.reactivestreams
-
- io.grpc
- org.apache.pulsar.shade.io.grpc
-
-
- okio
- org.apache.pulsar.shade.okio
-
-
- com.squareup
- org.apache.pulsar.shade.com.squareup
-
-
- io.opencensus
- org.apache.pulsar.shade.io.opencensus
-
-
- org.eclipse.jetty
- org.apache.pulsar.shade.org.eclipse.jetty
-
-
- org.objenesis
- org.apache.pulsar.shade.org.objenesis
-
-
- org.yaml
- org.apache.pulsar.shade.org.yaml
-
-
- io.swagger
- org.apache.pulsar.shade.io.swagger
-
-
- org.apache.bookkeeper
- org.apache.pulsar.shade.org.apache.bookkeeper
-
-
-
- (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
- $1org_apache_pulsar_shade_$3
- true
-
+
+ org.yaml
+ org.apache.pulsar.shade.org.yaml
+
-
-
+
+
+
+
+ true
+
+
diff --git a/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder b/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000000000..99a08cc8ca4d1
--- /dev/null
+++ b/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file
diff --git a/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate b/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
new file mode 100644
index 0000000000000..0adc919b7f0c2
--- /dev/null
+++ b/pulsar-client-admin-shaded/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.internal.RuntimeDelegateImpl
\ No newline at end of file
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 36070618ed891..0a94e48e9b939 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -76,8 +76,8 @@
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
javax.activation
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index e26f6eeac57bf..74007745c70ee 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -1,3 +1,4 @@
+
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
org.apache.pulsar
pulsar
4.1.0-SNAPSHOT
-
pulsar-client-all
Pulsar Client All
-
${project.groupId}
@@ -69,7 +67,6 @@
test
-
@@ -107,7 +104,6 @@
-
maven-antrun-plugin
@@ -120,15 +116,13 @@
-
+
-
org.apache.maven.plugins
@@ -145,67 +139,67 @@
true
true
false
-
- org.apache.pulsar:pulsar-client-original
- org.apache.pulsar:pulsar-client-admin-original
- org.apache.commons:commons-lang3
- commons-codec:commons-codec
- commons-collections:commons-collections
- org.asynchttpclient:*
- io.netty:netty-codec-http
- io.netty:netty-transport-native-epoll
- org.reactivestreams:reactive-streams
- com.typesafe.netty:netty-reactive-streams
- org.javassist:javassist
- com.google.guava:*
- org.checkerframework:*
+ com.fasterxml.jackson.*:*
+ com.google.*:*
+ com.google.auth:*
com.google.code.findbugs:*
+ com.google.code.gson:gson
com.google.errorprone:*
+ com.google.guava:*
com.google.j2objc:*
- com.google.code.gson:gson
com.google.re2j:re2j
com.spotify:completable-futures
- com.fasterxml.jackson.*:*
- io.netty:netty
- io.netty:netty-all
- io.netty:netty-tcnative-boringssl-static
- org.eclipse.jetty:*
+ com.squareup.*:*
+ com.sun.activation:javax.activation
+
+ com.thoughtworks.paranamer:paranamer
+ com.typesafe.netty:netty-reactive-streams
com.yahoo.datasketches:*
+ com.yahoo.datasketches:sketches-core
commons-*:*
- io.swagger:*
+ commons-codec:commons-codec
+ commons-collections:commons-collections
io.airlift:*
-
- org.apache.pulsar:pulsar-common
- org.apache.bookkeeper:*
- com.yahoo.datasketches:sketches-core
- org.glassfish.jersey*:*
- javax.ws.rs:*
- javax.xml.bind:jaxb-api
- jakarta.annotation:*
- org.glassfish.hk2*:*
io.grpc:*
- io.perfmark:*
- com.yahoo.datasketches:*
- io.netty:*
io.netty.incubator:*
- com.squareup.*:*
- com.google.*:*
- commons-*:*
- org.eclipse.jetty:*
- com.google.auth:*
- org.jvnet.mimepull:*
+ io.netty:*
+ io.netty:netty
+ io.netty:netty-all
+ io.netty:netty-codec-http
+ io.netty:netty-tcnative-boringssl-static
+ io.netty:netty-transport-native-epoll
io.opencensus:*
- org.objenesis:*
- org.yaml:snakeyaml
+ io.perfmark:*
+ io.swagger:*
+ jakarta.activation:jakarta.activation-api
+ jakarta.annotation:jakarta.annotation-api
+ jakarta.ws.rs:jakarta.ws.rs-api
+ jakarta.xml.bind:jakarta.xml.bind-api
+ javax.ws.rs:*
+ javax.xml.bind:jaxb-api
+ net.jcip:jcip-annotations
org.apache.avro:*
-
- com.thoughtworks.paranamer:paranamer
+ org.apache.bookkeeper:*
org.apache.commons:commons-compress
- org.tukaani:xz
+ org.apache.commons:commons-lang3
+ org.apache.pulsar:pulsar-client-admin-original
org.apache.pulsar:pulsar-client-messagecrypto-bc
+ org.apache.pulsar:pulsar-client-original
+ org.apache.pulsar:pulsar-common
+ org.asynchttpclient:*
+ org.checkerframework:*
+ org.eclipse.jetty:*
+ org.glassfish.hk2*:*
+ org.glassfish.jersey*:*
+ org.javassist:javassist
+ org.jvnet.mimepull:*
+ org.objenesis:*
+ org.reactivestreams:reactive-streams
+ org.tukaani:xz
+ org.yaml:snakeyaml
com.fasterxml.jackson.core:jackson-annotations
@@ -219,23 +213,54 @@
**
-
+
org/bouncycastle/**
+
+ org.asynchttpclient:async-http-client
+
+ **
+
+
+ org/asynchttpclient/config/ahc-default.properties
+
+
+
+ *:*
+
+ **/module-info.class
+ findbugsExclude.xml
+ META-INF/*-LICENSE
+ META-INF/*-NOTICE
+ META-INF/*.DSA
+ META-INF/*.RSA
+ META-INF/*.SF
+ META-INF/DEPENDENCIES*
+ META-INF/io.netty.versions.properties
+ META-INF/LICENSE*
+ META-INF/license/**
+ META-INF/MANIFEST.MF
+ META-INF/maven/**
+ META-INF/native-image/**
+ META-INF/NOTICE*
+ META-INF/proguard/**
+
+
+
- org.asynchttpclient
- org.apache.pulsar.shade.org.asynchttpclient
-
-
- org.apache.bookkeeper
- org.apache.pulsar.shade.org.apache.bookkeeper
+ (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
+ $1org_apache_pulsar_shade_$3
+ true
- org.apache.commons
- org.apache.pulsar.shade.org.apache.commons
+ com.fasterxml.jackson
+ org.apache.pulsar.shade.com.fasterxml.jackson
+
+ com.fasterxml.jackson.annotation.*
+
com.google
@@ -249,103 +274,109 @@
org.apache.pulsar.shade.com.spotify.futures
- com.fasterxml.jackson
- org.apache.pulsar.shade.com.fasterxml.jackson
-
- com.fasterxml.jackson.annotation.*
-
+ com.squareup
+ org.apache.pulsar.shade.com.squareup
- io.netty
- org.apache.pulsar.shade.io.netty
+ com.sun.activation
+ org.apache.pulsar.shade.com.sun.activation
- org.apache.pulsar.policies
- org.apache.pulsar.shade.org.apache.pulsar.policies
+ com.thoughtworks.paranamer
+ org.apache.pulsar.shade.com.thoughtworks.paranamer
- com.yahoo.datasketches
- org.apache.pulsar.shade.com.yahoo.datasketches
+ com.typesafe
+ org.apache.pulsar.shade.com.typesafe
com.yahoo
org.apache.pulsar.shade.com.yahoo
- org.eclipse.jetty
- org.apache.pulsar.shade.org.eclipse
-
-
- org.reactivestreams
- org.apache.pulsar.shade.org.reactivestreams
+ com.yahoo.datasketches
+ org.apache.pulsar.shade.com.yahoo.datasketches
- com.typesafe
- org.apache.pulsar.shade.com.typesafe
+ io.airlift
+ org.apache.pulsar.shade.io.airlift
- javax.ws
- org.apache.pulsar.shade.javax.ws
+ io.grpc
+ org.apache.pulsar.shade.io.grpc
- javax.annotation
- org.apache.pulsar.shade.javax.annotation
+ io.netty
+ org.apache.pulsar.shade.io.netty
- javax.xml.bind
- org.apache.pulsar.shade.javax.xml.bind
+ io.opencensus
+ org.apache.pulsar.shade.io.opencensus
- jersey
- org.apache.pulsar.shade.jersey
+ io.swagger
+ org.apache.pulsar.shade.io.swagger
- org.jvnet
- org.apache.pulsar.shade.org.jvnet
+ javassist
+ org.apache.pulsar.shade.javassist
- org.aopalliance
- org.apache.pulsar.shade.org.aopalliance
+ javax.activation
+ org.apache.pulsar.shade.javax.activation
- javassist
- org.apache.pulsar.shade.javassist
+ javax.annotation
+ org.apache.pulsar.shade.javax.annotation
javax.inject
org.apache.pulsar.shade.javax.inject
- org.glassfish
- org.apache.pulsar.shade.org.glassfish
+ javax.ws
+ org.apache.pulsar.shade.javax.ws
+
+
+ javax.xml.bind
+ org.apache.pulsar.shade.javax.xml.bind
+
+
+ jersey
+ org.apache.pulsar.shade.jersey
- io.grpc
- org.apache.pulsar.shade.io.grpc
+ META-INF/versions/(\d+)/com/fasterxml/jackson/core/
+ META-INF/versions/$1/org/apache/pulsar/shade/com/fasterxml/jackson/core/
+
+ true
- okio
- org.apache.pulsar.shade.okio
+ META-INF/versions/(\d+)/javax/xml/bind/
+ META-INF/versions/$1/org/apache/pulsar/shade/javax/xml/bind/
+ true
- com.squareup
- org.apache.pulsar.shade.com.squareup
+ META-INF/versions/(\d+)/org/glassfish/
+ META-INF/versions/$1/org/apache/pulsar/shade/org/glassfish/
+ true
- io.opencensus
- org.apache.pulsar.shade.io.opencensus
+ META-INF/versions/(\d+)/org/yaml/
+ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/
+ true
- org.eclipse.jetty
- org.apache.pulsar.shade.org.eclipse.jetty
+ net.jcip
+ org.apache.pulsar.shade.net.jcip
- org.objenesis
- org.apache.pulsar.shade.org.objenesis
+ okio
+ org.apache.pulsar.shade.okio
- org.yaml
- org.apache.pulsar.shade.org.yaml
+ org.aopalliance
+ org.apache.pulsar.shade.org.aopalliance
org.apache.avro
@@ -363,45 +394,68 @@
org.apache.avro.reflect.Union
-
-
- org.codehaus.jackson
- org.apache.pulsar.shade.org.codehaus.jackson
-
- com.thoughtworks.paranamer
- org.apache.pulsar.shade.com.thoughtworks.paranamer
+ org.apache.bookkeeper
+ org.apache.pulsar.shade.org.apache.bookkeeper
org.apache.commons
org.apache.pulsar.shade.org.apache.commons
- io.airlift
- org.apache.pulsar.shade.io.airlift
+ org.apache.pulsar.policies
+ org.apache.pulsar.shade.org.apache.pulsar.policies
+
+
+ org.asynchttpclient
+ org.apache.pulsar.shade.org.asynchttpclient
org.checkerframework
org.apache.pulsar.shade.org.checkerframework
+
- javax.annotation
- org.apache.pulsar.shade.javax.annotation
+ org.codehaus.jackson
+ org.apache.pulsar.shade.org.codehaus.jackson
+
+
+ org.eclipse.jetty
+ org.apache.pulsar.shade.org.eclipse
+
+
+ org.glassfish
+ org.apache.pulsar.shade.org.glassfish
+
+
+ org.jvnet
+ org.apache.pulsar.shade.org.jvnet
+
+
+ org.objenesis
+ org.apache.pulsar.shade.org.objenesis
+
+
+ org.reactivestreams
+ org.apache.pulsar.shade.org.reactivestreams
org.tukaani
org.apache.pulsar.shade.org.tukaani
-
- (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
- $1org_apache_pulsar_shade_$3
- true
+ org.yaml
+ org.apache.pulsar.shade.org.yaml
-
-
+
+
+
+
+ true
+
+
diff --git a/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder b/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000000000..99a08cc8ca4d1
--- /dev/null
+++ b/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file
diff --git a/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate b/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
new file mode 100644
index 0000000000000..0adc919b7f0c2
--- /dev/null
+++ b/pulsar-client-all/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.internal.RuntimeDelegateImpl
\ No newline at end of file
diff --git a/pulsar-client-auth-athenz/pom.xml b/pulsar-client-auth-athenz/pom.xml
index 99786b4d18dd8..0e994ce25c24e 100644
--- a/pulsar-client-auth-athenz/pom.xml
+++ b/pulsar-client-auth-athenz/pom.xml
@@ -46,6 +46,11 @@
athenz-zts-java-client-core
+
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+
+
com.yahoo.athenz
athenz-cert-refresher
diff --git a/pulsar-client-auth-sasl/pom.xml b/pulsar-client-auth-sasl/pom.xml
index 1a4720b3d589d..61d1157afda34 100644
--- a/pulsar-client-auth-sasl/pom.xml
+++ b/pulsar-client-auth-sasl/pom.xml
@@ -57,8 +57,8 @@
- javax.ws.rs
- javax.ws.rs-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index cd87d901b21bb..1093b405731ea 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -1,3 +1,4 @@
+
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
org.apache.pulsar
pulsar
4.1.0-SNAPSHOT
-
pulsar-client
Pulsar Client Java
-
${project.groupId}
@@ -48,11 +46,8 @@
${project.version}
-
-
-
org.apache.maven.plugins
maven-dependency-plugin
@@ -88,7 +83,6 @@
-
maven-antrun-plugin
@@ -101,15 +95,13 @@
-
+
-
org.apache.maven.plugins
@@ -124,50 +116,54 @@
true
true
false
-
- org.apache.pulsar:pulsar-client-original
- org.apache.bookkeeper:*
- org.apache.commons:commons-lang3
- commons-codec:commons-codec
- commons-collections:commons-collections
- org.asynchttpclient:*
- io.netty:netty-codec-http
- io.netty:netty-transport-native-epoll
- org.reactivestreams:reactive-streams
- com.typesafe.netty:netty-reactive-streams
- org.javassist:javassist
- com.google.guava:*
- org.checkerframework:*
+ com.fasterxml.jackson.*:*
com.google.code.findbugs:*
+ com.google.code.gson:gson
com.google.errorprone:*
+ com.google.guava:*
com.google.j2objc:*
- com.google.code.gson:gson
com.google.re2j:re2j
com.spotify:completable-futures
- com.fasterxml.jackson.*:*
- io.netty:*
- io.netty.incubator:*
- io.perfmark:*
- org.eclipse.jetty:*
+ com.sun.activation:javax.activation
+
+ com.thoughtworks.paranamer:paranamer
+ com.typesafe.netty:netty-reactive-streams
com.yahoo.datasketches:*
+ com.yahoo.datasketches:sketches-core
commons-*:*
- io.swagger:*
+ commons-codec:commons-codec
+ commons-collections:commons-collections
io.airlift:*
-
- org.apache.pulsar:pulsar-common
- com.yahoo.datasketches:sketches-core
- org.objenesis:*
- org.yaml:snakeyaml
-
+ io.netty.incubator:*
+ io.netty:*
+ io.netty:netty-codec-http
+ io.netty:netty-transport-native-epoll
+ io.perfmark:*
+ io.swagger:*
+ jakarta.activation:jakarta.activation-api
+ jakarta.annotation:jakarta.annotation-api
+ jakarta.ws.rs:jakarta.ws.rs-api
+ jakarta.xml.bind:jakarta.xml.bind-api
+ javax.ws.rs:*
+ net.jcip:jcip-annotations
org.apache.avro:*
-
- com.thoughtworks.paranamer:paranamer
+ org.apache.bookkeeper:*
org.apache.commons:commons-compress
- org.tukaani:xz
+ org.apache.commons:commons-lang3
org.apache.pulsar:pulsar-client-messagecrypto-bc
+ org.apache.pulsar:pulsar-client-original
+ org.apache.pulsar:pulsar-common
+ org.asynchttpclient:*
+ org.checkerframework:*
+ org.eclipse.jetty:*
+ org.javassist:javassist
+ org.objenesis:*
+ org.reactivestreams:reactive-streams
+ org.tukaani:xz
+ org.yaml:snakeyaml
com.fasterxml.jackson.core:jackson-annotations
@@ -180,23 +176,45 @@
**
-
+
org/bouncycastle/**
+
+ *:*
+
+ **/module-info.class
+ findbugsExclude.xml
+ META-INF/*-LICENSE
+ META-INF/*-NOTICE
+ META-INF/*.DSA
+ META-INF/*.RSA
+ META-INF/*.SF
+ META-INF/DEPENDENCIES*
+ META-INF/io.netty.versions.properties
+ META-INF/LICENSE*
+ META-INF/license/**
+ META-INF/MANIFEST.MF
+ META-INF/maven/**
+ META-INF/native-image/**
+ META-INF/NOTICE*
+ META-INF/proguard/**
+
+
+
- org.asynchttpclient
- org.apache.pulsar.shade.org.asynchttpclient
-
-
- org.apache.commons
- org.apache.pulsar.shade.org.apache.commons
+ (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
+ $1org_apache_pulsar_shade_$3
+ true
- io.airlift
- org.apache.pulsar.shade.io.airlift
+ com.fasterxml.jackson
+ org.apache.pulsar.shade.com.fasterxml.jackson
+
+ com.fasterxml.jackson.annotation.*
+
com.google
@@ -210,63 +228,67 @@
org.apache.pulsar.shade.com.spotify.futures
- com.fasterxml.jackson
- org.apache.pulsar.shade.com.fasterxml.jackson
-
- com.fasterxml.jackson.annotation.*
-
+ com.sun.activation
+ org.apache.pulsar.shade.com.sun.activation
- io.netty
- org.apache.pulsar.shade.io.netty
+ com.thoughtworks.paranamer
+ org.apache.pulsar.shade.com.thoughtworks.paranamer
- org.checkerframework
- org.apache.pulsar.shade.org.checkerframework
+ com.typesafe
+ org.apache.pulsar.shade.com.typesafe
- javax.annotation
- org.apache.pulsar.shade.javax.annotation
+ com.yahoo.datasketches
+ org.apache.pulsar.shade.com.yahoo.datasketches
- io.swagger
- org.apache.pulsar.shade.io.swagger
+ com.yahoo.memory
+ org.apache.pulsar.shade.com.yahoo.memory
- org.apache.pulsar.policies
- org.apache.pulsar.shade.org.apache.pulsar.policies
+ com.yahoo.sketches
+ org.apache.pulsar.shade.com.yahoo.sketches
- com.yahoo.datasketches
- org.apache.pulsar.shade.com.yahoo.datasketches
+ io.airlift
+ org.apache.pulsar.shade.io.airlift
- com.yahoo.sketches
- org.apache.pulsar.shade.com.yahoo.sketches
+ io.netty
+ org.apache.pulsar.shade.io.netty
- org.eclipse.jetty
- org.apache.pulsar.shade.org.eclipse
+ io.swagger
+ org.apache.pulsar.shade.io.swagger
- org.reactivestreams
- org.apache.pulsar.shade.org.reactivestreams
+ javax.activation
+ org.apache.pulsar.shade.javax.activation
- com.typesafe
- org.apache.pulsar.shade.com.typesafe
+ javax.annotation
+ org.apache.pulsar.shade.javax.annotation
- com.yahoo.memory
- org.apache.pulsar.shade.com.yahoo.memory
+ javax.ws
+ org.apache.pulsar.shade.javax.ws
- org.objenesis
- org.apache.pulsar.shade.org.objenesis
+ META-INF/versions/(\d+)/com/fasterxml/jackson/core/
+ META-INF/versions/$1/org/apache/pulsar/shade/com/fasterxml/jackson/core/
+
+ true
- org.yaml
- org.apache.pulsar.shade.org.yaml
+ META-INF/versions/(\d+)/org/yaml/
+ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/
+ true
+
+
+ net.jcip
+ org.apache.pulsar.shade.net.jcip
org.apache.avro
@@ -284,43 +306,65 @@
org.apache.avro.reflect.Union
-
+
+ org.apache.bookkeeper
+ org.apache.pulsar.shade.org.apache.bookkeeper
+
+
+ org.apache.commons
+ org.apache.pulsar.shade.org.apache.commons
+
+
+ org.apache.pulsar.policies
+ org.apache.pulsar.shade.org.apache.pulsar.policies
+
+
+ org.asynchttpclient
+ org.apache.pulsar.shade.org.asynchttpclient
+
+
+ org.checkerframework
+ org.apache.pulsar.shade.org.checkerframework
+
+
org.codehaus.jackson
org.apache.pulsar.shade.org.codehaus.jackson
- com.thoughtworks.paranamer
- org.apache.pulsar.shade.com.thoughtworks.paranamer
+ org.eclipse.jetty
+ org.apache.pulsar.shade.org.eclipse
- org.apache.commons
- org.apache.pulsar.shade.org.apache.commons
+ org.objenesis
+ org.apache.pulsar.shade.org.objenesis
- org.tukaani
- org.apache.pulsar.shade.org.tukaani
+ org.reactivestreams
+ org.apache.pulsar.shade.org.reactivestreams
- org.apache.bookkeeper
- org.apache.pulsar.shade.org.apache.bookkeeper
+ org.tukaani
+ org.apache.pulsar.shade.org.tukaani
-
- (META-INF/native/(lib)?)(netty.+\.(so|jnilib|dll))$
- $1org_apache_pulsar_shade_$3
- true
+ org.yaml
+ org.apache.pulsar.shade.org.yaml
-
-
+
+
+
+
+ true
+
+
-
com.github.spotbugs
spotbugs-maven-plugin
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 241dd173ea9a4..c823b8408c9bd 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -184,8 +184,8 @@
- javax.ws.rs
- javax.ws.rs-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
diff --git a/pulsar-functions/proto/pom.xml b/pulsar-functions/proto/pom.xml
index db87ff7ef2031..e9e9678d1b9b7 100644
--- a/pulsar-functions/proto/pom.xml
+++ b/pulsar-functions/proto/pom.xml
@@ -44,10 +44,10 @@
com.google.protobuf
protobuf-java-util
-
+
- javax.annotation
- javax.annotation-api
+ jakarta.annotation
+ jakarta.annotation-api
diff --git a/pulsar-functions/runtime/pom.xml b/pulsar-functions/runtime/pom.xml
index b04d25a5af08a..b2df8f224bc26 100644
--- a/pulsar-functions/runtime/pom.xml
+++ b/pulsar-functions/runtime/pom.xml
@@ -77,6 +77,10 @@
bcprov-jdk18on
org.bouncycastle
+
+ javax.annotation
+ javax.annotation-api
+
@@ -106,7 +110,7 @@
-
+
org.apache.maven.plugins
diff --git a/pulsar-functions/secrets/pom.xml b/pulsar-functions/secrets/pom.xml
index c7ab69ec612db..ac7d89a0a0c27 100644
--- a/pulsar-functions/secrets/pom.xml
+++ b/pulsar-functions/secrets/pom.xml
@@ -48,6 +48,10 @@
bcprov-jdk18on
org.bouncycastle
+
+ javax.annotation
+ javax.annotation-api
+
@@ -76,7 +80,7 @@
-
+
com.github.spotbugs
spotbugs-maven-plugin
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index 73ed347d24fee..2cea6e0893005 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -134,8 +134,8 @@
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
diff --git a/tiered-storage/jcloud/pom.xml b/tiered-storage/jcloud/pom.xml
index 366ba9ae38cc9..8fa504227feb1 100644
--- a/tiered-storage/jcloud/pom.xml
+++ b/tiered-storage/jcloud/pom.xml
@@ -104,8 +104,8 @@
- javax.xml.bind
- jaxb-api
+ jakarta.xml.bind
+ jakarta.xml.bind-api
javax.activation