1
0
mirror of synced 2026-08-05 17:57:15 +00:00

Update to JDK 25 (release = 17)

This commit updates the build to use JDK 25 while remaining compatable with JDK 17.

Note that we must update our JAAS related tests to use release=25 due to the disabling of
the Security Manager. See
https://docs.oracle.com/en/java/javase/25/security/security-manager-is-permanently-disabled.html

Closes gh-18512
This commit is contained in:
Robert Winch
2026-01-16 10:51:42 -06:00
parent 6e9b4f86a4
commit 048b6bdd88
11 changed files with 53 additions and 17 deletions
+1
View File
@@ -1,6 +1,7 @@
plugins {
id 'security-nullability'
id 'javadoc-warnings-error'
id 'test-compile-target-jdk25'
}
apply plugin: 'io.spring.convention.spring-module'
@@ -17,7 +17,6 @@
package org.springframework.security.web.jaasapi;
import java.io.IOException;
import java.security.AccessController;
import java.util.HashMap;
import javax.security.auth.Subject;
@@ -131,7 +130,7 @@ public class JaasApiIntegrationFilterTests {
*/
@Test
public void currentSubjectNull() {
assertThat(Subject.getSubject(AccessController.getContext())).isNull();
assertThat(Subject.current()).isNull();
}
@Test
@@ -207,7 +206,7 @@ public class JaasApiIntegrationFilterTests {
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
// See if the subject was updated
Subject currentSubject = Subject.getSubject(AccessController.getContext());
Subject currentSubject = Subject.current();
assertThat(currentSubject).isEqualTo(expectedValue);
// run so we know the chain was executed
super.doFilter(request, response);