From e330617ae917e565d35dabc8840b61673b570367 Mon Sep 17 00:00:00 2001 From: Tiago Casinhas Date: Fri, 26 Jan 2024 15:11:15 +0000 Subject: [PATCH 1/2] Add support for JDK 21 --- Tasks/MavenV2/task.json | 5 +++-- Tasks/MavenV2/task.loc.json | 5 +++-- Tasks/MavenV3/task.json | 5 +++-- Tasks/MavenV3/task.loc.json | 4 ++-- Tasks/MavenV4/task.json | 3 ++- Tasks/MavenV4/task.loc.json | 3 ++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json index 31a04d55233c..7d9df3deb19a 100644 --- a/Tasks/MavenV2/task.json +++ b/Tasks/MavenV2/task.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 231, - "Patch": 5 + "Minor": 232, + "Patch": 0 }, "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "demands": [ @@ -227,6 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", + "1.17": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)", diff --git a/Tasks/MavenV2/task.loc.json b/Tasks/MavenV2/task.loc.json index e3acd09df270..fadd9e2eab44 100644 --- a/Tasks/MavenV2/task.loc.json +++ b/Tasks/MavenV2/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 231, - "Patch": 5 + "Minor": 232, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [ @@ -227,6 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", + "1.21": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)", diff --git a/Tasks/MavenV3/task.json b/Tasks/MavenV3/task.json index 23fbdcf11f21..2ac28e46fa3e 100644 --- a/Tasks/MavenV3/task.json +++ b/Tasks/MavenV3/task.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 3, - "Minor": 231, - "Patch": 4 + "Minor": 232, + "Patch": 0 }, "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "demands": [ @@ -227,6 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", + "1.21": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)", diff --git a/Tasks/MavenV3/task.loc.json b/Tasks/MavenV3/task.loc.json index 271acac83717..9a5ce8d0758c 100644 --- a/Tasks/MavenV3/task.loc.json +++ b/Tasks/MavenV3/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 3, - "Minor": 231, - "Patch": 4 + "Minor": 232, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [ diff --git a/Tasks/MavenV4/task.json b/Tasks/MavenV4/task.json index 0706e5f07d98..c9056d7197df 100644 --- a/Tasks/MavenV4/task.json +++ b/Tasks/MavenV4/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 234, + "Minor": 235, "Patch": 0 }, "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", @@ -227,6 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", + "1.21": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)", diff --git a/Tasks/MavenV4/task.loc.json b/Tasks/MavenV4/task.loc.json index f85af45f9af9..e2d5742eb062 100644 --- a/Tasks/MavenV4/task.loc.json +++ b/Tasks/MavenV4/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 234, + "Minor": 235, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", @@ -227,6 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", + "1.21": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)", From ae1c0ab72cf2ae9c4f53594e7221c859af31c801 Mon Sep 17 00:00:00 2001 From: Tiago Casinhas Date: Thu, 1 Feb 2024 17:45:22 +0000 Subject: [PATCH 2/2] Update Tasks/MavenV2/task.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Miikka Ylätalo --- Tasks/MavenV2/task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json index 7d9df3deb19a..f8920bf8e528 100644 --- a/Tasks/MavenV2/task.json +++ b/Tasks/MavenV2/task.json @@ -227,7 +227,7 @@ "visibleRule": "javaHomeSelection = JDKVersion", "options": { "default": "default", - "1.17": "JDK 21", + "1.21": "JDK 21", "1.17": "JDK 17", "1.11": "JDK 11", "1.10": "JDK 10 (out of support)",