diff --git a/Jenkinsfile b/Jenkinsfile index 995944f1f5..a11078cda4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,7 +120,7 @@ def publishExtensions() { node('rhel8'){ stage 'Build JDT LS' - env.JAVA_HOME="${tool 'openjdk-11'}" + env.JAVA_HOME="${tool 'openjdk-17'}" env.PATH="${env.JAVA_HOME}/bin:${env.PATH}" sh 'java -version' @@ -132,7 +132,7 @@ node('rhel8'){ } node('rhel8'){ - env.JAVA_HOME="${tool 'openjdk-11'}" + env.JAVA_HOME="${tool 'openjdk-17'}" env.PATH="${env.JAVA_HOME}/bin:${env.PATH}" stage 'Checkout vscode-java code' deleteDir() diff --git a/package.json b/package.json index c4eb7f94b1..1492d32ea0 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "null" ], "default": null, - "description": "Specifies the folder path to the JDK (11 or more recent) used to launch the Java Language Server.\nOn Windows, backslashes must be escaped, i.e.\n\"java.home\":\"C:\\\\Program Files\\\\Java\\\\jdk11.0_8\"", + "description": "Specifies the folder path to the JDK (17 or more recent) used to launch the Java Language Server.\nOn Windows, backslashes must be escaped, i.e.\n\"java.home\":\"C:\\\\Program Files\\\\Java\\\\jdk-17.0_3\"", "scope": "machine-overridable", "deprecationMessage": "This setting is deprecated, please use 'java.jdt.ls.java.home' instead." }, @@ -181,7 +181,7 @@ "null" ], "default": null, - "description": "Specifies the folder path to the JDK (11 or more recent) used to launch the Java Language Server. This setting will replace the Java extension's embedded JRE to start the Java Language Server. \n\nOn Windows, backslashes must be escaped, i.e.\n\"java.jdt.ls.java.home\":\"C:\\\\Program Files\\\\Java\\\\jdk11.0_8\"", + "description": "Specifies the folder path to the JDK (17 or more recent) used to launch the Java Language Server. This setting will replace the Java extension's embedded JRE to start the Java Language Server. \n\nOn Windows, backslashes must be escaped, i.e.\n\"java.jdt.ls.java.home\":\"C:\\\\Program Files\\\\Java\\\\jdk-17.0_3\"", "scope": "machine-overridable" }, "java.jdt.ls.vmargs": { diff --git a/src/requirements.ts b/src/requirements.ts index 78f220fe52..eecafa11a2 100644 --- a/src/requirements.ts +++ b/src/requirements.ts @@ -9,7 +9,7 @@ import { Commands } from './commands'; import { logger } from './log'; import { checkJavaPreferences } from './settings'; -const REQUIRED_JDK_VERSION = 11; +const REQUIRED_JDK_VERSION = 17; export interface RequirementsData { tooling_jre: string; tooling_jre_version: number;