From e882782fd2a37be300ab4dc1610ff041f5fbced0 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Wed, 20 Nov 2024 08:10:09 +0000 Subject: [PATCH] [ubuntu, windows] Update maven to 3.9.9 --- images/ubuntu/Ubuntu2004-Readme.md | 3 +-- images/ubuntu/Ubuntu2204-Readme.md | 3 +-- images/ubuntu/Ubuntu2404-Readme.md | 3 +-- images/ubuntu/toolsets/toolset-2004.json | 2 +- images/ubuntu/toolsets/toolset-2204.json | 2 +- images/ubuntu/toolsets/toolset-2404.json | 2 +- images/windows/Windows2019-Readme.md | 3 +-- images/windows/Windows2022-Readme.md | 3 +-- images/windows/scripts/build/Install-JavaTools.ps1 | 2 +- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 11 files changed, 11 insertions(+), 16 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 6222be003e98..e4499ccb56dd 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -64,7 +64,7 @@ to accomplish this. - Ant 1.10.7 - Gradle 8.10.2 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 - Sbt 1.10.5 ### Tools @@ -397,4 +397,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 3e7c0c786ec8..942e6302d7df 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -62,7 +62,7 @@ to accomplish this. - Ant 1.10.12 - Gradle 8.11 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 - Sbt 1.10.5 ### Tools @@ -390,4 +390,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 8e3a624ce9a3..5c1031aed2dc 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -59,7 +59,7 @@ to accomplish this. - Ant 1.10.14 - Gradle 8.11 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 ### Tools - Ansible 2.17.6 @@ -314,4 +314,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.6.1+really5.4.5-1build0.1 | | zip | 3.0-13build1 | | zsync | 0.6.2-5build1 | - diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 9ce39fca297f..4f9452399d89 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -73,7 +73,7 @@ "java": { "default": "11", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 0a45df9fc55c..2bace3e5939b 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -70,7 +70,7 @@ "java": { "default": "11", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index fa71fd067422..fe4956f838d0 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -65,7 +65,7 @@ "java": { "default": "17", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-11076708_latest.zip", diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a8680c43dbb3..e2ef64df4e85 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -46,7 +46,7 @@ ### Project Management - Ant 1.10.14 - Gradle 8.11 -- Maven 3.8.7 +- Maven 3.9.9 - sbt 1.10.5 ### Tools @@ -559,4 +559,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5c61a6c5cd84002f31b40d365e505a2c2310acec806faa30b8e2cc209150dd54 | 2024-11-12 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:d3bd9a71fc0c0e7f768c607fdbc60cba66ace7a2fc833bcb01992c247d7d78df | 2024-11-01 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d14e163a476ddf6bfe08997551777cf1382288784825158263e002d1f4eeb29c | 2024-11-01 | - diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index cbaedb55630b..9b9b5ccaa051 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -46,7 +46,7 @@ ### Project Management - Ant 1.10.14 - Gradle 8.11 -- Maven 3.8.7 +- Maven 3.9.9 - sbt 1.10.5 ### Tools @@ -556,4 +556,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:6825e3532d36741b62ea87bd7fd984cf4eea0be568b6669f52cc211126e67f52 | 2024-11-12 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:be37c9e8bf388c4e3ef27b4a2592b94adab551e231644ce3c9d4d3dc0a50af41 | 2024-11-02 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:87837eac4a78e1c67a6f6db1333a57a1a39207549c689905bd69cce40d063d5d | 2024-11-02 | - diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 655e6ad072ca..00470a10b0fa 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -110,7 +110,7 @@ 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 diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 446e652c4b33..4baa7abb073d 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -452,7 +452,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 e15af72cd5ac..9ffb63162e8f 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -361,7 +361,7 @@ "default": "18" }, "maven": { - "version": "3.8" + "version": "3.9" }, "mysql": { "version": "8.0",