This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 82fcb18bae7 [improve] replace jcip annotations to jsr305 annotations
(#25252)
82fcb18bae7 is described below
commit 82fcb18bae7327981e5ad74d09807b14e8c8e301
Author: sindhushreem25 <[email protected]>
AuthorDate: Tue Feb 24 11:41:08 2026 +0530
[improve] replace jcip annotations to jsr305 annotations (#25252)
Co-authored-by: Lari Hotari <[email protected]>
---
distribution/licenses/LICENSE-jcip.txt | 7 -------
distribution/server/src/assemble/LICENSE.bin.txt | 5 ++---
distribution/server/src/assemble/NOTICE.bin.txt | 3 +--
distribution/shell/src/assemble/LICENSE.bin.txt | 5 ++---
distribution/shell/src/assemble/NOTICE.bin.txt | 2 --
pom.xml | 10 ++++------
pulsar-client-admin-shaded/pom.xml | 6 +-----
pulsar-client-all/pom.xml | 6 +-----
pulsar-client-shaded/pom.xml | 6 +-----
pulsar-client/pom.xml | 4 ++--
.../main/java/org/apache/pulsar/client/impl/MessagesImpl.java | 2 +-
11 files changed, 15 insertions(+), 41 deletions(-)
diff --git a/distribution/licenses/LICENSE-jcip.txt
b/distribution/licenses/LICENSE-jcip.txt
deleted file mode 100644
index 62d7c83a568..00000000000
--- 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 acc07da2e67..d733739309a 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
@@ -629,9 +630,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 7705416042a..4fd685546c6 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 [email protected]
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt
b/distribution/shell/src/assemble/LICENSE.bin.txt
index c2fa019e8df..31f36833dce 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
@@ -463,9 +464,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 41c9bd7d217..c06cd316058 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 [email protected]
diff --git a/pom.xml b/pom.xml
index ab4e5f839ea..b82fe0b1f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,7 +260,6 @@ flexible messaging model and an intuitive client
API.</description>
<hdfs-offload-version3>${hadoop3.version}</hdfs-offload-version3>
<hbase.version>2.6.3-hadoop3</hbase.version>
<guava.version>33.4.8-jre</guava.version>
- <jcip.version>1.0</jcip.version>
<prometheus-jmx.version>0.16.1</prometheus-jmx.version>
<confluent.version>7.9.2</confluent.version>
<aircompressor.version>0.27</aircompressor.version>
@@ -377,6 +376,7 @@ flexible messaging model and an intuitive client
API.</description>
<commons-configuration2.version>2.12.0</commons-configuration2.version>
<mina-core.version>2.1.10</mina-core.version>
<lz4java.version>1.10.3</lz4java.version>
+ <jsr305.version>3.0.2</jsr305.version>
</properties>
<dependencyManagement>
@@ -1516,13 +1516,11 @@ flexible messaging model and an intuitive client
API.</description>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
-
<dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>${jcip.version}</version>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
</dependency>
-
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
diff --git a/pulsar-client-admin-shaded/pom.xml
b/pulsar-client-admin-shaded/pom.xml
index 3c16d141be2..9c9857e9739 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -141,7 +141,7 @@
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.ws.rs:*</include>
<include>javax.xml.bind:jaxb-api</include>
- <include>net.jcip:jcip-annotations</include>
+ <include>com.google.code.findbugs:jsr305</include>
<include>org.apache.bookkeeper:*</include>
<include>org.apache.commons:commons-compress</include>
<include>org.apache.commons:commons-lang3</include>
@@ -339,10 +339,6 @@
<shadedPattern>META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/</shadedPattern>
<rawString>true</rawString>
</relocation>
- <relocation>
- <pattern>net.jcip</pattern>
-
<shadedPattern>org.apache.pulsar.shade.net.jcip</shadedPattern>
- </relocation>
<relocation>
<pattern>okio</pattern>
<shadedPattern>org.apache.pulsar.shade.okio</shadedPattern>
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index d390eb918eb..dfe7527c104 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -189,7 +189,7 @@
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.ws.rs:*</include>
<include>javax.xml.bind:jaxb-api</include>
- <include>net.jcip:jcip-annotations</include>
+ <include>com.google.code.findbugs:jsr305</include>
<include>org.apache.avro:*</include>
<include>org.apache.bookkeeper:*</include>
<include>org.apache.commons:commons-compress</include>
@@ -387,10 +387,6 @@
<shadedPattern>META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/</shadedPattern>
<rawString>true</rawString>
</relocation>
- <relocation>
- <pattern>net.jcip</pattern>
-
<shadedPattern>org.apache.pulsar.shade.net.jcip</shadedPattern>
- </relocation>
<relocation>
<pattern>okio</pattern>
<shadedPattern>org.apache.pulsar.shade.okio</shadedPattern>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 79205a5b191..de6e782a250 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -157,7 +157,7 @@
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.ws.rs:*</include>
- <include>net.jcip:jcip-annotations</include>
+ <include>com.google.code.findbugs:jsr305</include>
<include>org.apache.avro:*</include>
<include>org.apache.bookkeeper:*</include>
<include>org.apache.commons:commons-compress</include>
@@ -309,10 +309,6 @@
<shadedPattern>META-INF/versions/$1/org/apache/pulsar/shade/org/yaml/</shadedPattern>
<rawString>true</rawString>
</relocation>
- <relocation>
- <pattern>net.jcip</pattern>
-
<shadedPattern>org.apache.pulsar.shade.net.jcip</shadedPattern>
- </relocation>
<relocation>
<pattern>org.apache.avro</pattern>
<shadedPattern>org.apache.pulsar.shade.org.apache.avro</shadedPattern>
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index 44703b5b1d9..e317c036761 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -181,8 +181,8 @@
</dependency>
<dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
</dependency>
<dependency>
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 d4cd36a22e1..bea51d244ea 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 static
com.google.common.base.Preconditions.checkArgument;
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;
