From 5cb3444ca7b8085b7ead970417525e5a46f641a2 Mon Sep 17 00:00:00 2001 From: vidya sagar nimmagaddi Date: Wed, 8 Jan 2025 13:26:51 +0530 Subject: [PATCH 1/2] [Windows] update maven version 3.9 Co-authored-by: Tim Jacomb --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 212d286df4b8..d53afe00a9bd 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -449,7 +449,7 @@ "default": "18.*" }, "maven": { - "version": "3.8" + "version": "3.9" }, "mysql": { "version": "5.7", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7f93108b7d93..280820b87dc9 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -359,7 +359,7 @@ "default": "18.*" }, "maven": { - "version": "3.8" + "version": "3.9" }, "mysql": { "version": "8.0", From c6b6edcb7bfb88a6e471905c1d276ab6af701be6 Mon Sep 17 00:00:00 2001 From: vidya sagar nimmagaddi Date: Wed, 8 Jan 2025 13:34:14 +0530 Subject: [PATCH 2/2] [Windows] Updated maven version 9.0 Co-authored-by: Tim Jacomb --- images/windows/scripts/build/Install-JavaTools.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 655e6ad072ca..7bec25373c1e 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -110,7 +110,6 @@ foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Install-ChocoPackage ant -ArgumentList "--ignore-dependencies" -# Maven 3.9.x has multiple compatibilities problems $toolsetMavenVersion = (Get-ToolsetContent).maven.version $versionToInstall = Resolve-ChocoPackageVersion -PackageName "maven" -TargetVersion $toolsetMavenVersion