Skip to content

Commit ed8fa24

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 619f9ba + 0cd2050 commit ed8fa24

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
java_version: ['17', '21', '23']
22+
java_version: ['17', '21', '24']
2323
os: ['ubuntu-24.04']
2424
include:
2525
- java_version: '17'

src/test/java/tools/jackson/databind/misc/AccessFixTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ public void testCauseOfThrowableIgnoral() throws Exception
4141
_testCauseOfThrowableIgnoral(mapper);
4242
} catch (UnsupportedOperationException e) {
4343
// JDK 21+ fail?
44-
verifyException(e, "Security Manager is deprecated");
44+
verifyException(e,
45+
// JDK 21, 22, 23
46+
"Security Manager is deprecated",
47+
// JDK 24
48+
"Setting a Security Manager is not supported");
4549
} finally {
4650
if (setSucceeded) {
4751
System.setSecurityManager(origSecMan);

0 commit comments

Comments
 (0)