Merge branch '7.0.x'

This commit is contained in:
Sam Brannen
2026-06-27 18:09:31 +02:00
30 changed files with 100 additions and 65 deletions
@@ -97,6 +97,7 @@ class ResourceBundleMessageSourceTests {
doTestMessageAccess(true, false, true, true, false);
}
@SuppressWarnings("deprecation") // for Locale constructors on JDK 19
protected void doTestMessageAccess(
boolean reloadable, boolean fallbackToSystemLocale,
boolean expectGermanFallback, boolean useCodeAsDefaultMessage, boolean alwaysUseMessageFormat) {
@@ -406,6 +407,7 @@ class ResourceBundleMessageSourceTests {
}
@Test
@SuppressWarnings("deprecation") // for Locale constructors on JDK 19
void reloadableResourceBundleMessageSourceFileNameCalculation() {
ReloadableResourceBundleMessageSource ms = new ReloadableResourceBundleMessageSource();
@@ -225,6 +225,7 @@ class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
}
@Test
@SuppressWarnings("deprecation") // for Thread.getId() on JDK 19
void mxBeanOperationAccess() throws Exception {
MBeanClientInterceptor interceptor = new MBeanClientInterceptor();
interceptor.setServer(ManagementFactory.getPlatformMBeanServer());