[bigtop] branch branch-3.2 updated: BIGTOP-3952. Fix toolchain to download Maven from archive.apache.org instead of dlcdn.apache.org. (#1121)

[iwasakims]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 10d6aea6 BIGTOP-3952. Fix toolchain to download Maven from 
archive.apache.org instead of dlcdn.apache.org. (#1121)
10d6aea6 is described below

commit 10d6aea67c236d3ac83affc2c5044faf1ec04931
Author: Kengo Seki <sek...@apache.org>
AuthorDate: Thu Jun 22 09:34:45 2023 +0900

    BIGTOP-3952. Fix toolchain to download Maven from archive.apache.org 
instead of dlcdn.apache.org. (#1121)
    
    (cherry picked from commit 7111a5eef47981c623dad0008b7a027bcb254dd9)
---
 bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb     | 2 +-
 bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb   | 2 +-
 bigtop_toolchain/lib/puppet/parser/functions/nearest_apache_mirror.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb 
b/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
index 0e90fd78..79ff5937 100644
--- a/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
+++ b/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
@@ -17,6 +17,6 @@ module Puppet::Parser::Functions
     newfunction(:latest_ant_binary, :type => :rvalue) do |args|
         versionmask=args[0]
         # We are using main mirror here because can't be sure about Apache 
Server config on every mirror. It could be Nginx, btw. 
-        %x(curl -L --stderr /dev/null 
'https://dlcdn.apache.org/ant/binaries/?F=0&amp;V=1' | grep -o 
'<li>.*href="apache-ant-#{versionmask}-bin.tar.gz"'  |  grep -o 
"apache-ant-#{versionmask}" | tail -1 | tr -d '\r').chomp
+        %x(curl -L --stderr /dev/null 
'https://archive.apache.org/dist/ant/binaries/?F=0&amp;V=1' | grep -o 
'<li>.*href="apache-ant-#{versionmask}-bin.tar.gz"'  |  grep -o 
"apache-ant-#{versionmask}" | tail -1 | tr -d '\r').chomp
     end
 end
diff --git 
a/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb 
b/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
index 82da54da..f89b5ef8 100644
--- a/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
+++ b/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
@@ -17,6 +17,6 @@ module Puppet::Parser::Functions
     newfunction(:latest_maven_binary, :type => :rvalue) do |args|
         versionmask=args[0]
         # We are using main mirror here because can't be sure about Apache 
Server config on every mirror. It could be Nginx, btw.
-        %x(curl -L --stderr /dev/null 
'https://dlcdn.apache.org/maven/maven-3/?F=0&amp;V=1' | grep -o 
'<li>.*href="#{versionmask}/"' | tail -1 | grep -o '#{versionmask}'| tr -d 
'\r').chomp
+        %x(curl -L --stderr /dev/null 
'https://archive.apache.org/dist/maven/maven-3/?F=0&amp;V=1' | grep -o 
'<li>.*href="#{versionmask}/"' | tail -1 | grep -o '#{versionmask}'| tr -d 
'\r').chomp
     end
 end
diff --git 
a/bigtop_toolchain/lib/puppet/parser/functions/nearest_apache_mirror.rb 
b/bigtop_toolchain/lib/puppet/parser/functions/nearest_apache_mirror.rb
index f7c81641..1faa0b2f 100644
--- a/bigtop_toolchain/lib/puppet/parser/functions/nearest_apache_mirror.rb
+++ b/bigtop_toolchain/lib/puppet/parser/functions/nearest_apache_mirror.rb
@@ -15,6 +15,6 @@
 
 module Puppet::Parser::Functions
     newfunction(:nearest_apache_mirror, :type => :rvalue) do |args|
-        %x( curl --stderr /dev/null 
https://www.apache.org/dyn/closer.cgi?as_json=1 | grep preferred |cut -d '"' -f 
4 | tr -d '\r').chomp
+        'https://archive.apache.org/dist'
     end
 end