Apache Lucene open-source search software
Allow building with java 18 now that gradle supports it (#11889)
Robert Muir8736c1874756
diff --git a/README.md b/README.mdindex d5e61bc6cad..d8ff9234044 100644--- a/README.md+++ b/README.md@@ -39,7 +39,7 @@ comprehensive documentation, visit:### Basic steps:-1. Install OpenJDK 17 (exactly this version).+1. Install OpenJDK 17 or 18.2. Clone Lucene's git repository (or download the source distribution).3. Run gradle launcher script (`gradlew`).diff --git a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.javaindex f4c287f32f0..8dd2fe62bc2 100644--- a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java+++ b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java@@ -61,8 +61,8 @@ public class WrapperDownloader {public static void checkVersion() {int major = Runtime.getRuntime().version().feature();- if (major != 17) {- throw new IllegalStateException("java version be exactly 17, your version: " + major);+ if (major < 17 || major > 18) {+ throw new IllegalStateException("java version be 17 or 18, your version: " + major);}}diff --git a/gradlew b/gradlewindex 03e24cab3e5..20d5bf31c34 100755--- a/gradlew+++ b/gradlew@@ -124,7 +124,7 @@ GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar""$JAVACMD" $JAVA_OPTS --source 11 "$APP_HOME/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"WRAPPER_STATUS=$?if [ "$WRAPPER_STATUS" -eq 1 ]; then- echo "ERROR: Something went wrong. Make sure you're using Java 17."+ echo "ERROR: Something went wrong. Make sure you're using Java 17 or 18."exit $WRAPPER_STATUSelif [ "$WRAPPER_STATUS" -ne 0 ]; thenexit $WRAPPER_STATUSdiff --git a/gradlew.bat b/gradlew.batindex 97d3e3538cc..4e4ea743a49 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -97,7 +97,7 @@ goto fail:failWithJvmMessage@rem https://github.com/apache/lucene/pull/819-echo Error: Something went wrong. Make sure you're using Java 17.+echo Error: Something went wrong. Make sure you're using Java 17 or 18.:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of