From b42f91fd86287ec796cb71aaa4f243265abfa24b Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Thu, 19 Feb 2026 10:07:09 +0530 Subject: [PATCH 1/8] Because of licencing terms moving the annotations from jcip to javax and spotbugs annotations Removal of jcip and moving to spotbugs and javax annotations . --- distribution/licenses/LICENSE-jcip.txt | 7 ------- distribution/server/src/assemble/LICENSE.bin.txt | 4 +--- distribution/server/src/assemble/NOTICE.bin.txt | 3 +-- distribution/shell/src/assemble/LICENSE.bin.txt | 4 +--- distribution/shell/src/assemble/NOTICE.bin.txt | 2 -- pom.xml | 7 +------ pulsar-client-admin-shaded/pom.xml | 6 +----- pulsar-client-all/pom.xml | 6 +----- pulsar-client-shaded/pom.xml | 6 +----- pulsar-client/pom.xml | 5 +---- .../java/org/apache/pulsar/client/impl/MessagesImpl.java | 2 +- 11 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 distribution/licenses/LICENSE-jcip.txt diff --git a/distribution/licenses/LICENSE-jcip.txt b/distribution/licenses/LICENSE-jcip.txt deleted file mode 100644 index 62d7c83a56880..0000000000000 --- a/distribution/licenses/LICENSE-jcip.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2005 Brian Goetz and Tim Peierls -Released under the Creative Commons Attribution License - (http://creativecommons.org/licenses/by/2.5) -Official home: http://www.jcip.net - -Any republication or derived work distributed in source code form -must include this copyright and license notice. diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index dc721f4dc23f7..1eb880d586421 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -629,9 +629,7 @@ Eclipse Public License - v2.0 -- ../licenses/LICENSE-EPL-2.0.txt Public Domain (CC0) -- ../licenses/LICENSE-CC0.txt * Reactive Streams -- org.reactivestreams-reactive-streams-1.0.3.jar -Creative Commons Attribution License - * Jcip -- ../licenses/LICENSE-jcip.txt - - net.jcip-jcip-annotations-1.0.jar + Bouncy Castle License * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt diff --git a/distribution/server/src/assemble/NOTICE.bin.txt b/distribution/server/src/assemble/NOTICE.bin.txt index 7705416042a17..4fd685546c68d 100644 --- a/distribution/server/src/assemble/NOTICE.bin.txt +++ b/distribution/server/src/assemble/NOTICE.bin.txt @@ -11,8 +11,7 @@ The Apache Software Foundation (http://www.apache.org/). Bouncy Castle Copyright (c) 2000-2015 The Legion Of The Bouncy Castle Inc. (http://www.bouncycastle.org) -Jcip -Copyright (c) 2005 Brian Goetz and Tim Peierls + JCommander Copyright 2010 Cedric Beust cedric@beust.com diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 0ccf0042bb0cf..8ad7f529afcd7 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -463,9 +463,7 @@ Eclipse Public License - v2.0 -- ../licenses/LICENSE-EPL-2.0.txt Public Domain (CC0) -- ../licenses/LICENSE-CC0.txt * Reactive Streams -- reactive-streams-1.0.3.jar -Creative Commons Attribution License - * Jcip -- ../licenses/LICENSE-jcip.txt - - jcip-annotations-1.0.jar + Bouncy Castle License * Bouncy Castle -- ../licenses/LICENSE-bouncycastle.txt diff --git a/distribution/shell/src/assemble/NOTICE.bin.txt b/distribution/shell/src/assemble/NOTICE.bin.txt index 41c9bd7d217da..c06cd316058fc 100644 --- a/distribution/shell/src/assemble/NOTICE.bin.txt +++ b/distribution/shell/src/assemble/NOTICE.bin.txt @@ -11,8 +11,6 @@ The Apache Software Foundation (http://www.apache.org/). Bouncy Castle Copyright (c) 2000-2015 The Legion Of The Bouncy Castle Inc. (http://www.bouncycastle.org) -Jcip -Copyright (c) 2005 Brian Goetz and Tim Peierls JCommander Copyright 2010 Cedric Beust cedric@beust.com diff --git a/pom.xml b/pom.xml index ea67901f85a1c..ea0b123df5534 100644 --- a/pom.xml +++ b/pom.xml @@ -260,7 +260,6 @@ flexible messaging model and an intuitive client API. ${hadoop3.version} 2.6.3-hadoop3 33.4.8-jre - 1.0 0.16.1 7.9.2 0.27 @@ -1517,11 +1516,7 @@ flexible messaging model and an intuitive client API. ${javassist.version} - - net.jcip - jcip-annotations - ${jcip.version} - + io.airlift diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 3c16d141be280..a32c079ed2f44 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -141,7 +141,7 @@ jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* javax.xml.bind:jaxb-api - net.jcip:jcip-annotations + com.github.spotbugs:spotbugs-annotations org.apache.bookkeeper:* org.apache.commons:commons-compress org.apache.commons:commons-lang3 @@ -339,10 +339,6 @@ 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 diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index d390eb918ebf4..83773cb32dcfa 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -189,7 +189,7 @@ jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* javax.xml.bind:jaxb-api - net.jcip:jcip-annotations + com.github.spotbugs:spotbugs-annotations org.apache.avro:* org.apache.bookkeeper:* org.apache.commons:commons-compress @@ -387,10 +387,6 @@ 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 diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 79205a5b19128..460da408dad8a 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -157,7 +157,7 @@ jakarta.ws.rs:jakarta.ws.rs-api jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* - net.jcip:jcip-annotations + com.github.spotbugs:spotbugs-annotations org.apache.avro:* org.apache.bookkeeper:* org.apache.commons:commons-compress @@ -309,10 +309,6 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true - - net.jcip - org.apache.pulsar.shade.net.jcip - org.apache.avro org.apache.pulsar.shade.org.apache.avro diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 44703b5b1d91a..725512bc1d863 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -180,10 +180,7 @@ jackson-module-jsonSchema - - net.jcip - jcip-annotations - + org.jspecify diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java index d4cd36a22e15f..bea51d244eae0 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.jcip.annotations.NotThreadSafe; +import javax.annotation.concurrent.NotThreadSafe; import org.apache.pulsar.client.api.Message; import org.apache.pulsar.client.api.Messages; From 32247d205839069acfb927f3ead518415c29166b Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Thu, 19 Feb 2026 14:31:52 +0530 Subject: [PATCH 2/8] Added the relocation for spotbugs-annotations Added the relocation for spotbugs-annotations --- pulsar-client-admin-shaded/pom.xml | 4 ++++ pulsar-client-all/pom.xml | 4 ++++ pulsar-client-shaded/pom.xml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index a32c079ed2f44..2bd45a3a5df78 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -339,6 +339,10 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true + + edu.umd.cs.findbugs.annotations + org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations + okio org.apache.pulsar.shade.okio diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 83773cb32dcfa..2e47eecbaf148 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -387,6 +387,10 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true + + edu.umd.cs.findbugs.annotations + org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations + okio org.apache.pulsar.shade.okio diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 460da408dad8a..d80d0ba444408 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -309,6 +309,10 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true + + edu.umd.cs.findbugs.annotations + org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations + org.apache.avro org.apache.pulsar.shade.org.apache.avro From 90cdbf124f1d77c17a746651936c22999a9b751d Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Thu, 19 Feb 2026 17:10:01 +0530 Subject: [PATCH 3/8] resolved the comments resolved the comments. changed to javax.annotations --- pom.xml | 9 ++++++--- pulsar-client-admin-shaded/pom.xml | 4 ---- pulsar-client-all/pom.xml | 4 ---- pulsar-client-shaded/pom.xml | 4 ---- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index ea0b123df5534..97068e2372731 100644 --- a/pom.xml +++ b/pom.xml @@ -1515,9 +1515,12 @@ flexible messaging model and an intuitive client API. javassist ${javassist.version} - - - + + com.google.code.findbugs + jsr305 + 3.0.2 + compile + io.airlift aircompressor diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 2bd45a3a5df78..a32c079ed2f44 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -339,10 +339,6 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true - - edu.umd.cs.findbugs.annotations - org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations - okio org.apache.pulsar.shade.okio diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 2e47eecbaf148..83773cb32dcfa 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -387,10 +387,6 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true - - edu.umd.cs.findbugs.annotations - org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations - okio org.apache.pulsar.shade.okio diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index d80d0ba444408..460da408dad8a 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -309,10 +309,6 @@ META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/ true - - edu.umd.cs.findbugs.annotations - org.apache.pulsar.shade.edu.umd.cs.findbugs.annotations - org.apache.avro org.apache.pulsar.shade.org.apache.avro From cb12416ae80fd0c7d4c4a900807990b156d55acf Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Mon, 23 Feb 2026 10:31:49 +0530 Subject: [PATCH 4/8] Review comments incorporated --- pom.xml | 4 ++-- pulsar-client-admin-shaded/pom.xml | 2 +- pulsar-client-all/pom.xml | 2 +- pulsar-client-shaded/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 97068e2372731..21023c6c0c1f8 100644 --- a/pom.xml +++ b/pom.xml @@ -376,6 +376,7 @@ flexible messaging model and an intuitive client API. 2.12.0 2.1.10 1.10.3 + 3.0.2 @@ -1518,8 +1519,7 @@ flexible messaging model and an intuitive client API. com.google.code.findbugs jsr305 - 3.0.2 - compile + ${jsr305.version} io.airlift diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index a32c079ed2f44..9c9857e97393c 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -141,7 +141,7 @@ jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* javax.xml.bind:jaxb-api - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 org.apache.bookkeeper:* org.apache.commons:commons-compress org.apache.commons:commons-lang3 diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 83773cb32dcfa..dfe7527c104d4 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -189,7 +189,7 @@ jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* javax.xml.bind:jaxb-api - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 org.apache.avro:* org.apache.bookkeeper:* org.apache.commons:commons-compress diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 460da408dad8a..de6e782a25067 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -157,7 +157,7 @@ jakarta.ws.rs:jakarta.ws.rs-api jakarta.xml.bind:jakarta.xml.bind-api javax.ws.rs:* - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 org.apache.avro:* org.apache.bookkeeper:* org.apache.commons:commons-compress From 77a0d48ef03c66053db80daf3785dbe69d4e3dd4 Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Mon, 23 Feb 2026 16:19:10 +0530 Subject: [PATCH 5/8] resolved --- pulsar-client/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 725512bc1d863..54745014df987 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -180,7 +180,10 @@ jackson-module-jsonSchema - + + com.google.code.findbugs + jsr305 + org.jspecify From 103451905eb2aab4e19ec134c1d8f19c5d67f96b Mon Sep 17 00:00:00 2001 From: sindhushreem25 Date: Mon, 23 Feb 2026 16:59:17 +0530 Subject: [PATCH 6/8] resolved --- distribution/server/src/assemble/LICENSE.bin.txt | 1 + distribution/shell/src/assemble/LICENSE.bin.txt | 1 + pulsar-client/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 1eb880d586421..5562aae4c4a8c 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -566,6 +566,7 @@ BSD 3-clause "New" or "Revised" License - com.google.auth-google-auth-library-oauth2-http-1.24.1.jar -- ../licenses/LICENSE-google-auth-library.txt * LevelDB -- (included in org.rocksdb.*.jar) -- ../licenses/LICENSE-LevelDB.txt * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt + * JSR305 -- jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt * JLine -- jline-jline-2.14.6.jar -- ../licenses/LICENSE-JLine.txt * JLine3 -- org.jline-jline-3.21.0.jar -- ../licenses/LICENSE-JLine.txt * OW2 ASM diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 8ad7f529afcd7..52e82742ff52d 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -426,6 +426,7 @@ The Apache Software License, Version 2.0 BSD 3-clause "New" or "Revised" License * JLine3 -- jline-3.21.0.jar -- ../licenses/LICENSE-JLine.txt + * JSR305 -- jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt MIT License * SLF4J -- ../licenses/LICENSE-SLF4J.txt diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 54745014df987..fe3bc5b7128b1 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -181,8 +181,8 @@ - com.google.code.findbugs - jsr305 + com.google.code.findbugs + jsr305 From c28744d184503e88945dce52b2d1e1ce51ead915 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 23 Feb 2026 13:54:14 +0200 Subject: [PATCH 7/8] Fix indent --- pulsar-client/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index fe3bc5b7128b1..e317c036761ff 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -180,10 +180,10 @@ jackson-module-jsonSchema - - com.google.code.findbugs - jsr305 - + + com.google.code.findbugs + jsr305 + org.jspecify From 8dd8d4c4255b1e103782a1753ef12a6475fef2cf Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 23 Feb 2026 13:55:54 +0200 Subject: [PATCH 8/8] Fix indent --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 21023c6c0c1f8..3009bf6cc0fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,9 +1517,9 @@ flexible messaging model and an intuitive client API. ${javassist.version} - com.google.code.findbugs - jsr305 - ${jsr305.version} + com.google.code.findbugs + jsr305 + ${jsr305.version} io.airlift