From ee5594de7b31ca19464291af23cc0f21991834c8 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Sun, 15 Dec 2024 16:04:03 +0100 Subject: [PATCH 1/2] fix(ubuntu/maven) avoid tragedy of commons goods: use `dlcdn` apache download server --- provisioning/ubuntu-provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/ubuntu-provision.sh b/provisioning/ubuntu-provision.sh index 95756b375..97d62247e 100755 --- 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 From 781d7829443e39496963ca9e1781e2f764b241a1 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Sun, 15 Dec 2024 16:05:22 +0100 Subject: [PATCH 2/2] fixup: windows --- provisioning/windows-provision.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1 index c130c5d45..262b31404 100644 --- 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;