From 12f056b8331b7f378a278b28aa68d0a50cc2b134 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 9 Apr 2020 12:25:24 -0700 Subject: [PATCH] Update IDE integration to reflect Java 14 requirement (#54990) --- CONTRIBUTING.md | 10 +++++----- gradle/ide.gradle | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74f97dafd2c..52513c42ce5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,11 +92,11 @@ Contributing to the Elasticsearch codebase **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) -JDK 13 is required to build Elasticsearch. You must have a JDK 13 installation +JDK 14 is required to build Elasticsearch. You must have a JDK 14 installation with the environment variable `JAVA_HOME` referencing the path to Java home for -your JDK 13 installation. By default, tests use the same runtime as `JAVA_HOME`. +your JDK 14 installation. By default, tests use the same runtime as `JAVA_HOME`. However, since Elasticsearch supports JDK 8, the build supports compiling with -JDK 13 and testing on a JDK 8 runtime; to do this, set `RUNTIME_JAVA_HOME` +JDK 14 and testing on a JDK 8 runtime; to do this, set `RUNTIME_JAVA_HOME` pointing to the Java home of a JDK 8 installation. Note that this mechanism can be used to test against other JDKs as well, this is not only limited to JDK 8. @@ -122,9 +122,9 @@ You can access Elasticsearch with: ### Importing the project into IntelliJ IDEA -Elasticsearch builds using Java 13. When importing into IntelliJ you will need +Elasticsearch builds using Java 14. When importing into IntelliJ you will need to define an appropriate SDK. The convention is that **this SDK should be named -"13"** so that the project import will detect it automatically. For more details +"14"** so that the project import will detect it automatically. For more details on defining an SDK in IntelliJ please refer to [their documentation](https://www.jetbrains.com/help/idea/sdk.html#define-sdk). SDK definitions are global, so you can add the JDK from any project, or after project import. Importing with a missing JDK will still work, IntelliJ will diff --git a/gradle/ide.gradle b/gradle/ide.gradle index b7cff0aa159..197b3ce6dba 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -1,3 +1,4 @@ +import org.elasticsearch.gradle.info.BuildParams import org.jetbrains.gradle.ext.Remote import org.jetbrains.gradle.ext.JUnit @@ -40,7 +41,7 @@ if (System.getProperty('idea.active') == 'true') { idea { project { vcs = 'Git' - jdkName = '13' + jdkName = BuildParams.minimumCompilerVersion.majorVersion settings { delegateActions {