diff --git a/x-pack/qa/evil-tests/build.gradle b/x-pack/qa/evil-tests/build.gradle index ad32645b3647c..553386bdfdf60 100644 --- a/x-pack/qa/evil-tests/build.gradle +++ b/x-pack/qa/evil-tests/build.gradle @@ -6,6 +6,9 @@ dependencies { } unitTest { + if (project.runtimeJavaVersion >= JavaVersion.VERSION_1_9) { + systemProperty 'java.locale.providers', 'COMPAT' + } systemProperty 'tests.security.manager', 'false' include '**/*Tests.class' } diff --git a/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/SimpleKdcLdapServerTests.java b/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/SimpleKdcLdapServerTests.java index 78ee814812c83..427425991b282 100644 --- a/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/SimpleKdcLdapServerTests.java +++ b/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/SimpleKdcLdapServerTests.java @@ -11,7 +11,6 @@ import com.unboundid.ldap.sdk.SearchScope; import org.elasticsearch.action.support.PlainActionFuture; -import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.env.Environment; @@ -51,9 +50,6 @@ public void testPrincipalCreationAndSearchOnLdap() throws Exception { } public void testClientServiceMutualAuthentication() throws PrivilegedActionException, GSSException, LoginException, ParseException { - assumeFalse("Java 15-ea causes issues with this test, see https://github.com/elastic/elasticsearch/issues/57749", - JavaVersion.current().compareTo(JavaVersion.parse("15")) >= 0); - final String serviceUserName = randomFrom(serviceUserNames); // Client login and init token preparation final String clientUserName = randomFrom(clientUserNames);