Skip to content

Commit def13b0

Browse files
wburnstristantarrant
authored andcommitted
[#573] Migrate jcip to errorprone
1 parent 9e0b860 commit def13b0

6 files changed

Lines changed: 9 additions & 14 deletions

File tree

core/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@
8585
</dependency>
8686

8787
<dependency>
88-
<groupId>net.jcip</groupId>
89-
<artifactId>jcip-annotations</artifactId>
88+
<groupId>com.google.errorprone</groupId>
89+
<artifactId>error_prone_annotations</artifactId>
90+
<scope>provided</scope>
9091
<optional>true</optional>
9192
</dependency>
9293

core/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
requires jdk.unsupported;
44
requires com.fasterxml.jackson.core;
55
requires static com.fasterxml.jackson.databind;
6-
requires static jcip.annotations;
6+
requires static com.google.errorprone.annotations;
77
requires org.jboss.logging;
88
requires static org.jboss.logging.annotations;
99
opens org.infinispan.protostream;

core/src/main/java/org/infinispan/protostream/SerializationContext.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
import java.util.Set;
44

5-
import net.jcip.annotations.ThreadSafe;
6-
75
/**
86
* A repository for Protobuf type definitions and their marshallers. All ProtoStream marshalling operations happen in
97
* the context of a {@code SerializationContext}.
108
*
119
* @author anistor@redhat.com
1210
* @since 1.0
1311
*/
14-
@ThreadSafe
1512
public interface SerializationContext extends ImmutableSerializationContext {
1613

1714
/**

core/src/main/java/org/infinispan/protostream/impl/RandomAccessOutputStreamImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
import org.infinispan.protostream.RandomAccessOutputStream;
1010

11-
import net.jcip.annotations.NotThreadSafe;
12-
13-
@NotThreadSafe
1411
public class RandomAccessOutputStreamImpl extends OutputStream implements RandomAccessOutputStream {
1512

1613
static final int MIN_SIZE = 32;

core/src/main/java/org/infinispan/protostream/impl/SerializationContextImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.infinispan.protostream.descriptors.ResolutionContext;
2828
import org.infinispan.protostream.impl.parser.ProtostreamProtoParser;
2929

30-
import net.jcip.annotations.GuardedBy;
30+
import com.google.errorprone.annotations.concurrent.GuardedBy;
3131

3232
/**
3333
* @author anistor@redhat.com

parent/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<version.junit>4.13.2</version.junit>
8181
<version.compile-testing>0.21</version.compile-testing>
8282
<version.mockito>5.20.0</version.mockito>
83-
<version.jcipannotations>1.0</version.jcipannotations>
8483
<version.jboss.logging>3.6.1.Final</version.jboss.logging>
8584
<version.jboss.logging.annotations>3.0.4.Final</version.jboss.logging.annotations>
8685
<version.jboss.logging.processor>3.0.4.Final</version.jboss.logging.processor>
@@ -89,6 +88,7 @@
8988
<version.jackson>2.20.1</version.jackson>
9089
<version.auto-service>1.1.1</version.auto-service>
9190
<version.assertj>3.27.6</version.assertj>
91+
<version.errorprone>2.23.0</version.errorprone>
9292
<version.protobuf>4.33.0</version.protobuf>
9393
</properties>
9494

@@ -203,9 +203,9 @@
203203
</dependency>
204204

205205
<dependency>
206-
<groupId>net.jcip</groupId>
207-
<artifactId>jcip-annotations</artifactId>
208-
<version>${version.jcipannotations}</version>
206+
<groupId>com.google.errorprone</groupId>
207+
<artifactId>error_prone_annotations</artifactId>
208+
<version>${version.errorprone}</version>
209209
<scope>provided</scope>
210210
<optional>true</optional>
211211
</dependency>

0 commit comments

Comments
 (0)