ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Update Ant in .winget files to point to 1.10.18

Browse Source 
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>
This commit is contained in:
Ilmari Lauhakangas
2026-09-09 14:53:20 +02:00
parent 8b2600bb4d
commit 5c4eeb28ba
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/admin_java_and_deps.winget
+2 -2
View File
@@ -68,9 +68,9 @@ properties:
securityContext: elevated securityContext: elevated
settings: settings:
DestinationPath: C:/Users/Public/Downloads 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 ChecksumType: SHA256
Checksum: 70608b7401dec8f51ce749b453eaf7d168e5eb2e00c8d541a64f247763567567 Checksum: d3d2009bc815e8fe4808e3af2f2aa7019cd666a26d112a3d9ea5a45345edf236
- resource: xPSDesiredStateConfiguration/xRemoteFile - resource: xPSDesiredStateConfiguration/xRemoteFile
id: junit id: junit
directives: directives:
.config/user_steps.winget
+5 -5
View File
@@ -18,7 +18,7 @@ properties:
# the empty string element is so that each file can be specified with trailing comma # the empty string element is so that each file can be specified with trailing comma
TestScript: | TestScript: |
$files = @( $files = @(
"apache-ant-1.10.17-bin.zip", "apache-ant-1.10.18-bin.zip",
"clang-format-5.0.0-win.exe", "clang-format-5.0.0-win.exe",
"jom_1_1_4.zip", "jom_1_1_4.zip",
"junit-4.10.jar", "junit-4.10.jar",
@@ -112,9 +112,9 @@ properties:
directives: directives:
description: extract ant to the ~/lo directory description: extract ant to the ~/lo directory
settings: settings:
TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.17/bin/ant" 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.17/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.17-bin.zip" -Destination "$env:USERPROFILE/lo/" SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.18-bin.zip" -Destination "$env:USERPROFILE/lo/"
- resource: xPSDesiredStateConfiguration/xScript - resource: xPSDesiredStateConfiguration/xScript
id: spp-extract id: spp-extract
dependsOn: dependsOn:
@@ -181,7 +181,7 @@ properties:
--disable-online-update --disable-online-update
--with-external-tar=$env:USERPROFILE\lo\lo-externaltar --with-external-tar=$env:USERPROFILE\lo\lo-externaltar
--with-strawberry-perl-portable=$env:USERPROFILE\lo\spp --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-junit=$env:USERPROFILE\lo\junit-4.10.jar
--with-doxygen=$env:USERPROFILE\lo\spp\c\bin\doxygen.exe --with-doxygen=$env:USERPROFILE\lo\spp\c\bin\doxygen.exe
#--enable-odk #--enable-odk