Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow building with java 18 now that gradle supports it (#11889) 

* Allow building with java 18 now that gradle supports it
* update the "generic error" in these scripts
This commit is contained in:
Robert Muir 2022-10-28 23:41:09 -04:00 committed by GitHub
parent e7253f112d
commit 8736c18747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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`).

4
buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java
View File

@ -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);
}
}

2
gradlew vendored
View File

@ -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_STATUS
elif [ "$WRAPPER_STATUS" -ne 0 ]; then
exit $WRAPPER_STATUS

2
gradlew.bat vendored
View File

@ -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.
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of