This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2e77b7b02ca9 [HADOOP-18786] Use CDN instead of ASF archive (#5789)
2e77b7b02ca9 is described below
commit 2e77b7b02ca9267176be609130cc59b7093f14e4
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Tue May 14 15:09:52 2024 -0400
[HADOOP-18786] Use CDN instead of ASF archive (#5789)
* Use Yetus 0.14.1 from downloads.apache.org in yetus-wrapper
* Use Maven 3.8.8 from downloads.apache.org in Win 10 Dockerfile
* Point users to downloads.apache.org for JVSC
* Use Solr 8.11.2 from downloads.apache.org in YARN Dockerfile
Contributed by Christopher Tubbs
---
dev-support/bin/yetus-wrapper | 4 ++--
dev-support/docker/Dockerfile_windows_10 | 6 +++---
.../hadoop-common/src/main/bin/hadoop-functions.sh | 2 +-
.../hadoop-yarn-applications-catalog-docker/Dockerfile | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index 77cdc50a4733..6ec28e6fede7 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -77,7 +77,7 @@ WANTED="$1"
shift
ARGV=("$@")
-HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.0}
+HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.1}
BIN=$(yetus_abs "${BASH_SOURCE-$0}")
BINDIR=$(dirname "${BIN}")
@@ -123,7 +123,7 @@ fi
## need to DL, etc
##
-BASEURL="https://archive.apache.org/dist/yetus/${HADOOP_YETUS_VERSION}/";
+BASEURL="https://downloads.apache.org/yetus/${HADOOP_YETUS_VERSION}/";
TARBALL="${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}-bin.tar"
GPGBIN=$(command -v gpg)
diff --git a/dev-support/docker/Dockerfile_windows_10
b/dev-support/docker/Dockerfile_windows_10
index cde224d8a49b..b414ad1b0d84 100644
--- a/dev-support/docker/Dockerfile_windows_10
+++ b/dev-support/docker/Dockerfile_windows_10
@@ -61,8 +61,8 @@ RUN powershell Invoke-WebRequest -URI
https://cdn.azul.com/zulu/bin/zulu8.62.0.1
RUN powershell Expand-Archive -Path
$Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
# Install Apache Maven.
-RUN powershell Invoke-WebRequest -URI
https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip
-OutFile $Env:TEMP\apache-maven-3.8.6-bin.zip
-RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.6-bin.zip
-DestinationPath "C:\Maven"
+RUN powershell Invoke-WebRequest -URI
https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip
-OutFile $Env:TEMP\apache-maven-3.8.8-bin.zip
+RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8-bin.zip
-DestinationPath "C:\Maven"
# Install CMake 3.19.0.
RUN powershell Invoke-WebRequest -URI
https://cmake.org/files/v3.19/cmake-3.19.0-win64-x64.zip -OutFile
$Env:TEMP\cmake-3.19.0-win64-x64.zip
@@ -135,7 +135,7 @@ ENV MAVEN_OPTS '-Xmx2048M -Xss128M'
ENV IS_WINDOWS 1
RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
-RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.6\bin"
+RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8\bin"
RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
RUN setx PATH "%PATH%;C:\ZStd"
RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"
diff --git
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index 45fba7232a09..919589cc9b28 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -1911,7 +1911,7 @@ function hadoop_start_secure_daemon
if [[ ! -f "${jsvc}" ]]; then
hadoop_error "JSVC_HOME is not set or set incorrectly. jsvc is required to
run secure"
hadoop_error "or privileged daemons. Please download and install jsvc from
"
- hadoop_error "http://archive.apache.org/dist/commons/daemon/binaries/ "
+ hadoop_error "https://downloads.apache.org/commons/daemon/binaries/ "
hadoop_error "and set JSVC_HOME to the directory containing the jsvc
binary."
exit 1
fi
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
index 4a3ec65fb000..2369bc10adc9 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
@@ -19,7 +19,7 @@ FROM centos:7
RUN yum -y install tomcat lsof krb5-workstation sssd-client curl
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p /opt/apache/solr && \
- curl -SL http://archive.apache.org/dist/lucene/solr/7.7.0/solr-7.7.0.tgz |
\
+ curl -SL https://downloads.apache.org/lucene/solr/8.11.2/solr-8.11.2.tgz |
\
tar -xzC /opt/apache/solr --strip 1
COPY src/main/scripts/setup-image.sh /setup-image.sh
COPY src/main/resources/samples.xml /tmp/samples.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
