Skip to content

Commit ada1b7e

Browse files
ivanduplenskikhivanduplenskikh
authored
Add JDK 21 as a selectable option to Maven tasks (#20693)
* Add JDK21 to Maven4 * Update Maven4 version * Update MavenV2/MavenV3 * Update Maven2 version
1 parent 92673cc commit ada1b7e

18 files changed

+76
-46
lines changed

Diff for: ‎Tasks/MavenV2/task.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 249,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"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`",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",

Diff for: ‎Tasks/MavenV2/task.loc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 249,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",

Diff for: ‎Tasks/MavenV3/task.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"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`",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",

Diff for: ‎Tasks/MavenV3/task.loc.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",

Diff for: ‎Tasks/MavenV4/task.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"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`",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",

Diff for: ‎Tasks/MavenV4/task.loc.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",

Diff for: ‎_generated/MavenV3.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|3.247.0
2-
Node20-225|3.247.1
1+
Default|3.249.5
2+
Node20-225|3.249.6

Diff for: ‎_generated/MavenV3/task.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"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`",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",
@@ -519,7 +520,8 @@
519520
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
520521
},
521522
"_buildConfigMapping": {
522-
"Default": "3.247.0",
523-
"Node20-225": "3.247.1"
523+
"Default": "3.249.5",
524+
"LocalPackages": "3.249.4",
525+
"Node20-225": "3.249.6"
524526
}
525527
}

Diff for: ‎_generated/MavenV3/task.loc.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",
@@ -519,7 +520,8 @@
519520
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
520521
},
521522
"_buildConfigMapping": {
522-
"Default": "3.247.0",
523-
"Node20-225": "3.247.1"
523+
"Default": "3.249.5",
524+
"LocalPackages": "3.249.4",
525+
"Node20-225": "3.249.6"
524526
}
525527
}

Diff for: ‎_generated/MavenV3_Node20/.npmrc

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
scripts-prepend-node-path=true
2+
3+
registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/
4+
5+
always-auth=true

Diff for: ‎_generated/MavenV3_Node20/task.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 1
20+
"Minor": 249,
21+
"Patch": 6
2222
},
2323
"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`",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",
@@ -523,7 +524,8 @@
523524
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
524525
},
525526
"_buildConfigMapping": {
526-
"Default": "3.247.0",
527-
"Node20-225": "3.247.1"
527+
"Default": "3.249.5",
528+
"LocalPackages": "3.249.4",
529+
"Node20-225": "3.249.6"
528530
}
529531
}

Diff for: ‎_generated/MavenV3_Node20/task.loc.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 3,
20-
"Minor": 247,
21-
"Patch": 1
20+
"Minor": 249,
21+
"Patch": 6
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -229,6 +229,7 @@
229229
"visibleRule": "javaHomeSelection = JDKVersion",
230230
"options": {
231231
"default": "default",
232+
"1.21": "JDK 21",
232233
"1.17": "JDK 17",
233234
"1.11": "JDK 11",
234235
"1.10": "JDK 10 (out of support)",
@@ -523,7 +524,8 @@
523524
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
524525
},
525526
"_buildConfigMapping": {
526-
"Default": "3.247.0",
527-
"Node20-225": "3.247.1"
527+
"Default": "3.249.5",
528+
"LocalPackages": "3.249.4",
529+
"Node20-225": "3.249.6"
528530
}
529531
}

Diff for: ‎_generated/MavenV4.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|4.247.0
2-
Node20-225|4.247.1
1+
Default|4.249.5
2+
Node20-225|4.249.6

Diff for: ‎_generated/MavenV4/task.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"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`",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",
@@ -527,7 +528,8 @@
527528
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
528529
},
529530
"_buildConfigMapping": {
530-
"Default": "4.247.0",
531-
"Node20-225": "4.247.1"
531+
"Default": "4.249.5",
532+
"LocalPackages": "4.249.4",
533+
"Node20-225": "4.249.6"
532534
}
533535
}

Diff for: ‎_generated/MavenV4/task.loc.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 0
20+
"Minor": 249,
21+
"Patch": 5
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",
@@ -527,7 +528,8 @@
527528
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
528529
},
529530
"_buildConfigMapping": {
530-
"Default": "4.247.0",
531-
"Node20-225": "4.247.1"
531+
"Default": "4.249.5",
532+
"LocalPackages": "4.249.4",
533+
"Node20-225": "4.249.6"
532534
}
533535
}

Diff for: ‎_generated/MavenV4_Node20/.npmrc

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
scripts-prepend-node-path=true
2+
3+
registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/
4+
5+
always-auth=true

Diff for: ‎_generated/MavenV4_Node20/task.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 1
20+
"Minor": 249,
21+
"Patch": 6
2222
},
2323
"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`",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",
@@ -531,7 +532,8 @@
531532
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
532533
},
533534
"_buildConfigMapping": {
534-
"Default": "4.247.0",
535-
"Node20-225": "4.247.1"
535+
"Default": "4.249.5",
536+
"LocalPackages": "4.249.4",
537+
"Node20-225": "4.249.6"
536538
}
537539
}

Diff for: ‎_generated/MavenV4_Node20/task.loc.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 4,
20-
"Minor": 247,
21-
"Patch": 1
20+
"Minor": 249,
21+
"Patch": 6
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"demands": [
@@ -237,6 +237,7 @@
237237
"visibleRule": "javaHomeSelection = JDKVersion",
238238
"options": {
239239
"default": "default",
240+
"1.21": "JDK 21",
240241
"1.17": "JDK 17",
241242
"1.11": "JDK 11",
242243
"1.10": "JDK 10 (out of support)",
@@ -531,7 +532,8 @@
531532
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
532533
},
533534
"_buildConfigMapping": {
534-
"Default": "4.247.0",
535-
"Node20-225": "4.247.1"
535+
"Default": "4.249.5",
536+
"LocalPackages": "4.249.4",
537+
"Node20-225": "4.249.6"
536538
}
537539
}

0 commit comments

Comments
 (0)