From 5c4eeb28ba1f93e497f0a3d7b20c0c9288c5f7a8 Mon Sep 17 00:00:00 2001
From: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Date: Tue, 8 Sep 2026 18:23:19 +0300
Subject: [PATCH] Update Ant in .winget files to point to 1.10.18

Switch to archive.apache.org for the URL as dlcdn does not retain old releases.

Change-Id: I295a1c8371ac543b73773749ba14e66671f8ced3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210561
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
 .config/admin_java_and_deps.winget |  4 ++--
 .config/user_steps.winget          | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.config/admin_java_and_deps.winget b/.config/admin_java_and_deps.winget
index a96506a09d80..af3a089e4757 100644
--- a/.config/admin_java_and_deps.winget
+++ b/.config/admin_java_and_deps.winget
@@ -68,9 +68,9 @@ properties:
         securityContext: elevated
       settings:
         DestinationPath: C:/Users/Public/Downloads
-        Uri: https://dlcdn.apache.org/ant/binaries/apache-ant-1.10.17-bin.zip
+        Uri: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.18-bin.zip
         ChecksumType: SHA256
-        Checksum: 70608b7401dec8f51ce749b453eaf7d168e5eb2e00c8d541a64f247763567567
+        Checksum: d3d2009bc815e8fe4808e3af2f2aa7019cd666a26d112a3d9ea5a45345edf236
     - resource: xPSDesiredStateConfiguration/xRemoteFile
       id: junit
       directives:
diff --git a/.config/user_steps.winget b/.config/user_steps.winget
index 2a5f2790e09b..5ad1099a3a3f 100644
--- a/.config/user_steps.winget
+++ b/.config/user_steps.winget
@@ -18,7 +18,7 @@ properties:
         # the empty string element is so that each file can be specified with trailing comma
         TestScript: |
           $files = @(
-              "apache-ant-1.10.17-bin.zip",
+              "apache-ant-1.10.18-bin.zip",
               "clang-format-5.0.0-win.exe",
               "jom_1_1_4.zip",
               "junit-4.10.jar",
@@ -112,9 +112,9 @@ properties:
       directives:
         description: extract ant to the ~/lo directory
       settings:
-        TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.17/bin/ant"
-        GetScript:  Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.17/bin/ant"
-        SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.17-bin.zip" -Destination "$env:USERPROFILE/lo/"
+        TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.18/bin/ant"
+        GetScript:  Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.18/bin/ant"
+        SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.18-bin.zip" -Destination "$env:USERPROFILE/lo/"
     - resource: xPSDesiredStateConfiguration/xScript
       id: spp-extract
       dependsOn:
@@ -181,7 +181,7 @@ properties:
           --disable-online-update
           --with-external-tar=$env:USERPROFILE\lo\lo-externaltar
           --with-strawberry-perl-portable=$env:USERPROFILE\lo\spp
-          --with-ant-home=$env:USERPROFILE\lo\apache-ant-1.10.17
+          --with-ant-home=$env:USERPROFILE\lo\apache-ant-1.10.18
           --with-junit=$env:USERPROFILE\lo\junit-4.10.jar
           --with-doxygen=$env:USERPROFILE\lo\spp\c\bin\doxygen.exe
           #--enable-odk