Skip to content

Commit 4d187cd

Browse files
committed
Add Jvm verification test
1 parent 6e036cb commit 4d187cd

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,10 @@ class BeamModulePlugin implements Plugin<Project> {
461461
return 'java11'
462462
} else if (ver <= JavaVersion.VERSION_17) {
463463
return 'java17'
464-
} else {
464+
} else if (ver <= JavaVersion.VERSION_21) {
465465
return 'java21'
466+
} else {
467+
return 'java25'
466468
}
467469
}
468470

@@ -989,7 +991,9 @@ class BeamModulePlugin implements Plugin<Project> {
989991
'-Xlint:-this-escape'
990992
]
991993
if (ver == '25') {
992-
options.compilerArgs += ['-Xlint:-dangling-doc-comments']
994+
options.compilerArgs += [
995+
'-Xlint:-dangling-doc-comments'
996+
]
993997
}
994998
// Error prone requires some packages to be exported/opened for Java 17+
995999
// Disabling checks since this property is only used for tests

sdks/java/io/debezium/src/main/java/org/apache/beam/io/debezium/DebeziumReadSchemaTransformProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Collection;
2424
import java.util.Collections;
2525
import java.util.List;
26-
import java.util.Objects;
2726
import java.util.stream.Collectors;
2827
import org.apache.beam.sdk.coders.RowCoder;
2928
import org.apache.beam.sdk.schemas.Schema;

sdks/java/testing/test-utils/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
4444
}
4545

46-
['8', '11', '17', '21'].each { String ver ->
46+
['8', '11', '17', '21', '25'].each { String ver ->
4747
tasks.create(name: "verifyJavaVersion${ver}", type: Test) {
4848
filter {
4949
includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyCodeIsCompiledWithJava8"

sdks/java/testing/test-utils/src/test/java/org/apache/beam/sdk/testutils/jvmverification/JvmVerification.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v17;
2222
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v1_8;
2323
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v21;
24+
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v25;
2425
import static org.junit.Assert.assertEquals;
2526

2627
import java.io.IOException;
@@ -41,6 +42,7 @@ public class JvmVerification {
4142
versionMapping.put("0037", v11);
4243
versionMapping.put("003d", v17);
4344
versionMapping.put("0041", v21);
45+
versionMapping.put("0045", v25);
4446
}
4547

4648
// bytecode
@@ -69,6 +71,11 @@ public void verifyTestCodeIsCompiledWithJava21() throws IOException {
6971
assertEquals(v21, getByteCodeVersion(JvmVerification.class));
7072
}
7173

74+
@Test
75+
public void verifyTestCodeIsCompiledWithJava25() throws IOException {
76+
assertEquals(v25, getByteCodeVersion(JvmVerification.class));
77+
}
78+
7279
// jvm
7380
@Test
7481
public void verifyRunningJVMVersionIs8() {
@@ -94,6 +101,12 @@ public void verifyRunningJVMVersionIs21() {
94101
assertEquals(v21.name, version);
95102
}
96103

104+
@Test
105+
public void verifyRunningJVMVersionIs25() {
106+
final String version = getJavaSpecification();
107+
assertEquals(v25.name, version);
108+
}
109+
97110
private static <T> Java getByteCodeVersion(final Class<T> clazz) throws IOException {
98111
final InputStream stream =
99112
clazz.getClassLoader().getResourceAsStream(clazz.getName().replace(".", "/") + ".class");
@@ -111,7 +124,8 @@ enum Java {
111124
v1_8("1.8"),
112125
v11("11"),
113126
v17("17"),
114-
v21("21");
127+
v21("21"),
128+
v25("25");
115129

116130
final String name;
117131

0 commit comments

Comments
 (0)