Merge pull request #1603 from jenkins-infra/dduportal-patch-1

fix(ubuntu/windows) avoid tragedy of commons goods: use `dlcdn` apache download server for Maven
jenkins-infra · Dec 17, 2024 · efdd950 · efdd950
2 parents 173079e + 781d782
commit efdd950
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/provisioning/ubuntu-provision.sh b/provisioning/ubuntu-provision.sh
@@ -397,7 +397,7 @@ function install_sops(){
 ## Ensure that maven is installed and configured (version from environment)
 function install_maven() {
   curl --fail --silent --location --show-error --output "/tmp/apache-maven-${MAVEN_VERSION}-bin.tar.gz" \
-    "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+    "https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
 
   tar --extract --gunzip --file="/tmp/apache-maven-${MAVEN_VERSION}-bin.tar.gz" --directory=/usr/share/
   ln -s "/usr/share/apache-maven-${MAVEN_VERSION}/bin/mvn" /usr/bin/mvn

diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1
@@ -125,7 +125,7 @@ $downloads = [ordered]@{
         'cleanupLocal' = 'true';
     }
     'maven' = @{
-        'url' = 'https://archive.apache.org/dist/maven/maven-3/{0}/binaries/apache-maven-{0}-bin.zip' -f $env:MAVEN_VERSION;
+        'url' = 'https://dlcdn.apache.org/maven/maven-3/{0}/binaries/apache-maven-{0}-bin.zip' -f $env:MAVEN_VERSION;
         'local' = "$baseDir\maven.zip";
         'expandTo' = $baseDir;
         'path' = '{0}\apache-maven-{1}\bin' -f $baseDir,$env:MAVEN_VERSION;