Skip to content

CASSJAVA-115: Java 25 support #2085

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
SiyaoIsHiding wants to merge 4 commits into
base: 4.x
Choose a base branch
from
+41 −8
Open

CASSJAVA-115: Java 25 support #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07d965d
java 25 bump dependencies
SiyaoIsHiding Apr 23, 2026
2fc855c
add 1.25
SiyaoIsHiding Apr 23, 2026
6ce4164
,
SiyaoIsHiding Apr 23, 2026
44a207a
CompletableFuture.get()
SiyaoIsHiding Apr 30, 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
10 changes: 8 additions & 2 deletions Jenkinsfile-datastax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ pipeline {
'1.8', // Oracle JDK version 1.8 (current default)
'openjdk@1.11', // OpenJDK version 11
'openjdk@1.17', // OpenJDK version 17
'openjdk@1.21' // OpenJDK version 21
'openjdk@1.21', // OpenJDK version 21
'openjdk@1.25' // OpenJDK version 25
],
description: '''JDK version to use for <b>TESTING</b> when running adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds. <i>All builds will use JDK8 for building the driver</i>
<table style="width:100%">
Expand All @@ -358,6 +359,10 @@ pipeline {
<td><strong>openjdk@1.21</strong></td>
<td>OpenJDK version 21</td>
</tr>
<tr>
<td><strong>openjdk@1.25</strong></td>
<td>OpenJDK version 25</td>
</tr>
</table>''')
booleanParam(
name: 'SKIP_SERIAL_ITS',
Expand Down Expand Up @@ -442,7 +447,8 @@ pipeline {
values '1.8', // jdk8
'openjdk@1.11', // jdk11
'openjdk@1.17', // jdk17
'openjdk@1.21' // jdk21
'openjdk@1.21', // jdk21
'openjdk@1.25' // jdk25
}
}

Expand Down
20 changes: 17 additions & 3 deletions ...sts/src/test/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousPagingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,23 @@ public void should_cancel_with_asynchronous_paging() {
CompletableFutures.getUninterruptibly(fetchNextPageFuture);
fail("Expected an execution exception since paging was cancelled.");
} catch (CancellationException e) {
assertThat(e)
.hasMessageContaining("Can't get more results")
.hasMessageContaining("query was cancelled");
/**
* Since Java 25 has a breaking change in CompletableFuture.get()
* See: https://github.com/openjdk/jdk/commit/8a4315f833f3700075d65fae6bc566011c837c07
* CancellationException will be wrapped in a new CancellationException, with "get" as the message,
* and the original CancellationException as the cause
*/

boolean exceptionHasBothMessages = e.getMessage() != null
&& e.getMessage().contains("Can't get more results")
&& e.getMessage().contains("query was cancelled");

boolean causeHasBothMessages = e.getCause() != null
&& e.getCause().getMessage() != null
&& e.getCause().getMessage().contains("Can't get more results")
&& e.getCause().getMessage().contains("query was cancelled");

assertThat(exceptionHasBothMessages || causeHasBothMessages).isTrue();
}
int i = 0;
for (Row row : pagingResult.currentPage()) {
Expand Down
19 changes: 16 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,12 +445,12 @@
<dependency>
<groupId>io.projectreactor.tools</groupId>
<artifactId>blockhound</artifactId>
<version>1.0.8.RELEASE</version>
<version>1.0.16.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor.tools</groupId>
<artifactId>blockhound-junit-platform</artifactId>
<version>1.0.8.RELEASE</version>
<version>1.0.16.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -545,7 +545,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.14</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -1068,6 +1068,19 @@ limitations under the License.]]></inlineHeader>
<mockitoopens.argline>--add-opens=java.base/jdk.internal.util.random=ALL-UNNAMED</mockitoopens.argline>
</properties>
</profile>
<profile>
<!-- workarounds for running tests with JDK21 -->
<id>test-jdk-25</id>
<activation>
<jdk>[25,)</jdk>
</activation>
<properties>
<!-- for DriverBlockHoundIntegrationIT when using JDK 13+, see https://github.com/reactor/BlockHound/issues/33 -->
<blockhound.argline>-XX:+AllowRedefinitionToAddDeleteMethods</blockhound.argline>
<!-- allow deep reflection for mockito when using JDK 17+, see https://stackoverflow.com/questions/70993863/mockito-can-not-mock-random-in-java-17 -->
<mockitoopens.argline>--add-opens=java.base/jdk.internal.util.random=ALL-UNNAMED</mockitoopens.argline>
</properties>
</profile>
</profiles>
<licenses>
<license>
Expand Down