natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude unnecessary dependencies introduced by caffeine update to 3.1.8 

patch by Stefan Miklosovic; reviewed by Ekaterina Dimitrova, Maxim Muzafarov for CASSANDRA-18906
This commit is contained in:
Stefan Miklosovic 2023-10-04 12:07:55 +02:00
parent fe92b0a36d
commit e8c595102a
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.build/parent-pom-template.xml
View File

@ -1038,6 +1038,16 @@
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.8</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jctools</groupId>

2
src/java/org/apache/cassandra/streaming/StreamingState.java
View File

@ -27,6 +27,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import com.google.common.annotations.VisibleForTesting;
@ -40,7 +41,6 @@ import org.apache.cassandra.tools.nodetool.formatter.TableBuilder;
import org.apache.cassandra.utils.Clock;
import org.apache.cassandra.utils.ObjectSizes;
import org.apache.cassandra.utils.TimeUUID;
import org.checkerframework.checker.nullness.qual.Nullable;
import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;