Skip to content

Commit

Permalink
Move to Java 17
Browse files Browse the repository at this point in the history
Signed-off-by: Snjezana Peco <[email protected]>
  • Loading branch information
snjeza committed Jun 6, 2022
1 parent 6ec891f commit a9bb2d4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
},
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/requirements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a9bb2d4

Please sign in to comment.