Skip to content

Commit 7bccbf4

Browse files
authored
Update IDE integration to reflect Java 14 requirement (elastic#54990)
1 parent 7003ac4 commit 7bccbf4

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ Contributing to the Elasticsearch codebase
9292

9393
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
9494

95-
JDK 13 is required to build Elasticsearch. You must have a JDK 13 installation
95+
JDK 14 is required to build Elasticsearch. You must have a JDK 14 installation
9696
with the environment variable `JAVA_HOME` referencing the path to Java home for
97-
your JDK 13 installation. By default, tests use the same runtime as `JAVA_HOME`.
97+
your JDK 14 installation. By default, tests use the same runtime as `JAVA_HOME`.
9898
However, since Elasticsearch supports JDK 11, the build supports compiling with
99-
JDK 13 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
99+
JDK 14 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
100100
pointing to the Java home of a JDK 11 installation. Note that this mechanism can
101101
be used to test against other JDKs as well, this is not only limited to JDK 11.
102102

@@ -121,9 +121,9 @@ You can access Elasticsearch with:
121121

122122
### Importing the project into IntelliJ IDEA
123123

124-
Elasticsearch builds using Java 13. When importing into IntelliJ you will need
124+
Elasticsearch builds using Java 14. When importing into IntelliJ you will need
125125
to define an appropriate SDK. The convention is that **this SDK should be named
126-
"13"** so that the project import will detect it automatically. For more details
126+
"14"** so that the project import will detect it automatically. For more details
127127
on defining an SDK in IntelliJ please refer to [their documentation](https://www.jetbrains.com/help/idea/sdk.html#define-sdk).
128128
SDK definitions are global, so you can add the JDK from any project, or after
129129
project import. Importing with a missing JDK will still work, IntelliJ will

gradle/ide.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.elasticsearch.gradle.info.BuildParams
12
import org.jetbrains.gradle.ext.Remote
23
import org.jetbrains.gradle.ext.JUnit
34

@@ -40,7 +41,7 @@ if (System.getProperty('idea.active') == 'true') {
4041
idea {
4142
project {
4243
vcs = 'Git'
43-
jdkName = '13'
44+
jdkName = BuildParams.minimumCompilerVersion.majorVersion
4445

4546
settings {
4647
delegateActions {

0 commit comments

Comments
 (0)