Skip to content

[improve] replace jcip annotations to jsr305 annotations #25252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sindhushreem25 wants to merge 8 commits into
base: master
Choose a base branch
from
+15 −41
Open

[improve] replace jcip annotations to jsr305 annotations #25252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b42f91f
Because of licencing terms moving the annotations from jcip to javax …
sindhushreem25 Feb 19, 2026
32247d2
Added the relocation for spotbugs-annotations
sindhushreem25 Feb 19, 2026
90cdbf1
resolved the comments
sindhushreem25 Feb 19, 2026
cb12416
Review comments incorporated
sindhushreem25 Feb 23, 2026
77a0d48
resolved
sindhushreem25 Feb 23, 2026
1034519
resolved
sindhushreem25 Feb 23, 2026
c28744d
Fix indent
lhotari Feb 23, 2026
8dd8d4c
Fix indent
lhotari Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions distribution/licenses/LICENSE-jcip.txt
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions distribution/server/src/assemble/LICENSE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions distribution/server/src/assemble/NOTICE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions distribution/shell/src/assemble/LICENSE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions distribution/shell/src/assemble/NOTICE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions pulsar-client-admin-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions pulsar-client-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions pulsar-client-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pulsar-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading