Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JDK 21 as a selectable option to Maven tasks #20693

Merged
merged 7 commits into from
Dec 2, 2024
Merged

Add JDK 21 as a selectable option to Maven tasks #20693

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71b514d
Add JDK21 to Maven4
ivanduplenskikh Nov 26, 2024
17e213e
Update Maven4 version
ivanduplenskikh Nov 26, 2024
e466f4f
Update MavenV2/MavenV3
ivanduplenskikh Nov 27, 2024
fce5cd6
Update Maven2 version
ivanduplenskikh Nov 27, 2024
c67b714
Merge branch 'master' into users/v-ivandu/add-jdk21-to-Maven4
ivanduplenskikh Nov 27, 2024
9e816a9
Merge branch 'master' into users/v-ivandu/add-jdk21-to-Maven4
ivanduplenskikh Nov 29, 2024
a10385a
Merge branch 'master' into users/v-ivandu/add-jdk21-to-Maven4
ivanduplenskikh Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Tasks/MavenV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 0
"Minor": 249,
"Patch": 5
},
"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": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/MavenV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 0
"Minor": 249,
"Patch": 5
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down
4 changes: 2 additions & 2 deletions _generated/MavenV4.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|4.247.0
Node20-225|4.247.1
Default|4.249.5
Node20-225|4.249.6
10 changes: 6 additions & 4 deletions _generated/MavenV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 0
"Minor": 249,
"Patch": 5
},
"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": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down Expand Up @@ -527,7 +528,8 @@
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
},
"_buildConfigMapping": {
"Default": "4.247.0",
"Node20-225": "4.247.1"
"Default": "4.249.5",
"LocalPackages": "4.249.4",
"Node20-225": "4.249.6"
}
}
10 changes: 6 additions & 4 deletions _generated/MavenV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 0
"Minor": 249,
"Patch": 5
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down Expand Up @@ -527,7 +528,8 @@
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
},
"_buildConfigMapping": {
"Default": "4.247.0",
"Node20-225": "4.247.1"
"Default": "4.249.5",
"LocalPackages": "4.249.4",
"Node20-225": "4.249.6"
}
}
4 changes: 4 additions & 0 deletions _generated/MavenV4_Node20/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
scripts-prepend-node-path=true

registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/

always-auth=true
10 changes: 6 additions & 4 deletions _generated/MavenV4_Node20/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 1
"Minor": 249,
"Patch": 6
},
"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": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down Expand Up @@ -531,7 +532,8 @@
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
},
"_buildConfigMapping": {
"Default": "4.247.0",
"Node20-225": "4.247.1"
"Default": "4.249.5",
"LocalPackages": "4.249.4",
"Node20-225": "4.249.6"
}
}
10 changes: 6 additions & 4 deletions _generated/MavenV4_Node20/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 247,
"Patch": 1
"Minor": 249,
"Patch": 6
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
Expand Down Expand Up @@ -237,6 +237,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)",
Expand Down Expand Up @@ -531,7 +532,8 @@
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
},
"_buildConfigMapping": {
"Default": "4.247.0",
"Node20-225": "4.247.1"
"Default": "4.249.5",
"LocalPackages": "4.249.4",
"Node20-225": "4.249.6"
}
}