Skip to content

Commit 2e77b7b

Browse files
authored
[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
1 parent 39dee8e commit 2e77b7b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

dev-support/bin/yetus-wrapper

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ WANTED="$1"
7777
shift
7878
ARGV=("$@")
7979

80-
HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.0}
80+
HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.1}
8181
BIN=$(yetus_abs "${BASH_SOURCE-$0}")
8282
BINDIR=$(dirname "${BIN}")
8383

@@ -123,7 +123,7 @@ fi
123123
## need to DL, etc
124124
##
125125

126-
BASEURL="https://archive.apache.org/dist/yetus/${HADOOP_YETUS_VERSION}/"
126+
BASEURL="https://downloads.apache.org/yetus/${HADOOP_YETUS_VERSION}/"
127127
TARBALL="${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}-bin.tar"
128128

129129
GPGBIN=$(command -v gpg)

dev-support/docker/Dockerfile_windows_10

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1
6161
RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
6262

6363
# Install Apache Maven.
64-
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
65-
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.6-bin.zip -DestinationPath "C:\Maven"
64+
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
65+
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8-bin.zip -DestinationPath "C:\Maven"
6666

6767
# Install CMake 3.19.0.
6868
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'
135135
ENV IS_WINDOWS 1
136136
RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
137137
RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
138-
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.6\bin"
138+
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8\bin"
139139
RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
140140
RUN setx PATH "%PATH%;C:\ZStd"
141141
RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"

hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ function hadoop_start_secure_daemon
19111911
if [[ ! -f "${jsvc}" ]]; then
19121912
hadoop_error "JSVC_HOME is not set or set incorrectly. jsvc is required to run secure"
19131913
hadoop_error "or privileged daemons. Please download and install jsvc from "
1914-
hadoop_error "http://archive.apache.org/dist/commons/daemon/binaries/ "
1914+
hadoop_error "https://downloads.apache.org/commons/daemon/binaries/ "
19151915
hadoop_error "and set JSVC_HOME to the directory containing the jsvc binary."
19161916
exit 1
19171917
fi

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM centos:7
1919
RUN yum -y install tomcat lsof krb5-workstation sssd-client curl
2020
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2121
RUN mkdir -p /opt/apache/solr && \
22-
curl -SL http://archive.apache.org/dist/lucene/solr/7.7.0/solr-7.7.0.tgz | \
22+
curl -SL https://downloads.apache.org/lucene/solr/8.11.2/solr-8.11.2.tgz | \
2323
tar -xzC /opt/apache/solr --strip 1
2424
COPY src/main/scripts/setup-image.sh /setup-image.sh
2525
COPY src/main/resources/samples.xml /tmp/samples.xml

0 commit comments

Comments
 (0)