Skip to content

Commit 803326c

Browse files
Prepare build for JDK24+
- enable running CI/CD matrix on JDK24 (dropping JDK23 for this) - adjust build script to set parameters so that unittests run without warnings from native access
1 parent a9db983 commit 803326c

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
java: [8, 11, 17, 21, 23]
19+
java: [8, 11, 17, 21, 24]
2020
# macos-13 is x86, macos-latest is aarch64
2121
os: [ubuntu-latest, macos-13, macos-latest]
2222
include:

build.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,10 @@ cd ..
12351235
<propertyref prefix="java.awt.headless"/>
12361236
</propertyset>
12371237
<junit fork="${test.fork}" forkmode="${test.forkmode}" failureproperty="testfailure" tempdir="${build}">
1238+
<!-- let JVM ignore unknown flags -->
1239+
<jvmarg value="-XX:+IgnoreUnrecognizedVMOptions" />
1240+
<!-- enable JNI on JDK 24+ -->
1241+
<jvmarg value="--enable-native-access=ALL-UNNAMED" />
12381242
<jvmarg if:set="test.jdwp" value="${test.jdwp}" />
12391243
<!-- optionally run headless -->
12401244
<syspropertyset refid="headless"/>

contrib/platform/build.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ com.sun.jna.platform.wince;version=&quot;${osgi.version}&quot;;uses:=&quot;com.s
317317
<propertyref name="w32.ascii"/>
318318
</propertyset>
319319
<junit fork="${test.fork}" failureproperty="testfailure" tempdir="${build}">
320+
<!-- let JVM ignore unknown flags -->
321+
<jvmarg value="-XX:+IgnoreUnrecognizedVMOptions" />
322+
<!-- enable JNI on JDK 24+ -->
323+
<jvmarg value="--enable-native-access=ALL-UNNAMED" />
320324
<jvmarg if:set="test.jdwp" value="${test.jdwp}" />
321325
<!-- optionally run headless -->
322326
<syspropertyset refid="headless"/>

0 commit comments

Comments
 (0)