This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.x by this push:
new 8c1009959 Upgrade Guava to 33.3.1-jre
8c1009959 is described below
commit 8c1009959e988d9f7249151ad260f64aa6afed63
Author: Lukasz Antoniak <[email protected]>
AuthorDate: Mon Dec 23 08:20:42 2024 +0100
Upgrade Guava to 33.3.1-jre
patch by Lukasz Antoniak; reviewed by Alexandre Dutra and Bret McGuire for
CASSJAVA-53
---
.../dse/driver/internal/core/cql/reactive/TestSubscriber.java | 5 +++--
guava-shaded/pom.xml | 10 ++--------
.../dse/driver/api/mapper/reactive/TestSubscriber.java | 6 +++++-
pom.xml | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java
b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java
index aed7a4dfc..652155e53 100644
---
a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java
+++
b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java
@@ -81,7 +81,8 @@ public class TestSubscriber<T> implements Subscriber<T> {
}
public void awaitTermination() {
- Uninterruptibles.awaitUninterruptibly(latch, 1, TimeUnit.MINUTES);
- if (latch.getCount() > 0) fail("subscriber not terminated");
+ if (!Uninterruptibles.awaitUninterruptibly(latch, 1, TimeUnit.MINUTES)) {
+ fail("subscriber not terminated");
+ }
}
}
diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index 9854fcc48..f480f9258 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -45,14 +45,6 @@
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -78,6 +70,8 @@
<includes>
<include>org.apache.cassandra:java-driver-guava-shaded</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:failureaccess</include>
+ <include>com.google.j2objc:j2objc-annotations</include>
</includes>
</artifactSet>
<relocations>
diff --git
a/mapper-runtime/src/test/java/com/datastax/dse/driver/api/mapper/reactive/TestSubscriber.java
b/mapper-runtime/src/test/java/com/datastax/dse/driver/api/mapper/reactive/TestSubscriber.java
index 6f23cfca9..6886b9a76 100644
---
a/mapper-runtime/src/test/java/com/datastax/dse/driver/api/mapper/reactive/TestSubscriber.java
+++
b/mapper-runtime/src/test/java/com/datastax/dse/driver/api/mapper/reactive/TestSubscriber.java
@@ -17,6 +17,8 @@
*/
package com.datastax.dse.driver.api.mapper.reactive;
+import static org.assertj.core.api.Fail.fail;
+
import
com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
@@ -70,6 +72,8 @@ public class TestSubscriber<T> implements Subscriber<T> {
}
public void awaitTermination() {
- Uninterruptibles.awaitUninterruptibly(latch, 1, TimeUnit.MINUTES);
+ if (!Uninterruptibles.awaitUninterruptibly(latch, 1, TimeUnit.MINUTES)) {
+ fail("subscriber not terminated");
+ }
}
}
diff --git a/pom.xml b/pom.xml
index 620cf1db4..c61e6485f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<!-- Version of Guava used in shaded module and for integration tests.
-->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>25.1-jre</version>
+ <version>33.3.1-jre</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
