Skip to content

Apache Lucene open-source search software

Revert "An attempt to make jenkins pass with the currently installed jdk24-ea. To be reverted later. #14600"

Dawid Weiss97073d9f00c3
diff --git a/gradle/java/javac.gradle b/gradle/java/javac.gradle
index 66b0bd89d54..537769ea191 100644
--- a/gradle/java/javac.gradle
+++ b/gradle/java/javac.gradle
@@ -1,5 +1,3 @@
-import org.gradle.internal.jvm.inspection.JvmInstallationMetadata
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,14 +27,6 @@ allprojects { project ->
options.compilerArgs += ["--release", rootProject.minJavaVersion.toString()]
}
- // TODO: temporary hack to enable builds to pass. https://github.com/apache/lucene/issues/14600
- JvmInstallationMetadata ver = rootProject.ext.runtimeJavaMetadata
- if (project.path == ":lucene:expressions" && ver.runtimeVersion.matches("24(.+)-ea")) {
- tasks.withType(JavaCompile) {
- options.compilerArgs += ["--enable-preview"]
- }
- }
-
// Configure warnings.
// Use 'javac --help-lint' to get the supported list
tasks.withType(JavaCompile) {
diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradle
index fda9457f478..4b421e1decf 100644
--- a/gradle/testing/alternative-jdk-support.gradle
+++ b/gradle/testing/alternative-jdk-support.gradle
@@ -88,7 +88,6 @@ if (jvmGradle != jvmCurrent) {
// Set up root project's properties.
rootProject.ext.runtimeJavaExecutable = jvmCurrent.javaExecutable
rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome
-rootProject.ext.runtimeJavaMetadata = jvmDetector.getMetadata(InstallationLocation.userDefined(jvmCurrent.javaHome, "specific path"))
-rootProject.ext.runtimeJavaVersion = runtimeJavaMetadata.getLanguageVersion()
+rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(InstallationLocation.userDefined(jvmCurrent.javaHome, "specific path")).getLanguageVersion()
rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent);