This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 39386090227 [improve][ci] Run filesystem offload tests also on Java 25
since Hadoop has been upgraded to 3.5.0 (#25482)
39386090227 is described below
commit 39386090227f7ec83867e860ebd42ae137c7bb09
Author: Lari Hotari <[email protected]>
AuthorDate: Wed Apr 8 02:35:15 2026 +0300
[improve][ci] Run filesystem offload tests also on Java 25 since Hadoop has
been upgraded to 3.5.0 (#25482)
---
.../tests/integration/offload/TestFileSystemOffload.java | 11 -----------
.../tests/integration/offload/TestOffloadDeletionFS.java | 11 -----------
tiered-storage/file-system/build.gradle.kts | 9 ---------
3 files changed, 31 deletions(-)
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
index 9f5653ef779..d658d80ddf4 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
@@ -22,22 +22,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.JavaVersion;
-import org.apache.commons.lang3.SystemUtils;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@Slf4j
public class TestFileSystemOffload extends TestBaseOffload {
- @BeforeClass
- public void checkJavaVersion() {
- if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_25)) {
- throw new SkipException("Filesystem Offload is incompatible with
Java 25");
- }
- }
-
@Test(dataProvider = "ServiceAndAdminUrls")
public void testPublishOffloadAndConsumeViaCLI(Supplier<String>
serviceUrl, Supplier<String> adminUrl)
throws Exception {
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
index 873b73d8c2b..70c2527e8ad 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
@@ -25,25 +25,14 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.JavaVersion;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.tests.integration.docker.ContainerExecException;
import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@Slf4j
public class TestOffloadDeletionFS extends TestBaseOffload {
- @BeforeClass
- public void checkJavaVersion() {
- if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_25)) {
- throw new SkipException("Filesystem Offload is incompatible with
Java 25");
- }
- }
-
@Override
protected int getEntrySize() {
return 512;
diff --git a/tiered-storage/file-system/build.gradle.kts
b/tiered-storage/file-system/build.gradle.kts
index 83558e1ae4d..ab9366d1573 100644
--- a/tiered-storage/file-system/build.gradle.kts
+++ b/tiered-storage/file-system/build.gradle.kts
@@ -81,12 +81,3 @@ dependencies {
testImplementation("org.eclipse.jetty:jetty-servlet:9.4.58.v20250814")
testImplementation("org.eclipse.jetty:jetty-util:9.4.58.v20250814")
}
-
-// Hadoop 3.4.x is incompatible with Java 25
-val testJavaVersion = providers.gradleProperty("testJavaVersion")
-val effectiveTestJava = testJavaVersion
- .orElse(provider { JavaVersion.current().majorVersion })
- .map { it.toInt() }
-tasks.withType<Test>().configureEach {
- enabled = effectiveTestJava.get() < 25
-}
\ No newline at end of file
