You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2022/10/10 09:08:28 UTC
[hadoop] branch branch-3.3.5 updated (8e8bc037aa6 -> cc5344e80fa)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a change to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from 8e8bc037aa6 HADOOP-18442. Remove openstack support (#4855)
new 2a4d421c5c3 HADOOP-18401. No ARM binaries in branch-3.3.x releases. (#4953)
new cc5344e80fa HADOOP-18468: Upgrade jettison to 1.5.1 to fix CVE-2022-40149 (#4937)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE-binary | 2 +-
dev-support/bin/create-release | 5 +++--
dev-support/docker/Dockerfile_aarch64 | 23 ++++++++++++----------
.../dev-support/jdiff-workaround.patch | 6 +++---
hadoop-project/pom.xml | 2 +-
5 files changed, 21 insertions(+), 17 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-18468: Upgrade jettison to 1.5.1 to fix CVE-2022-40149 (#4937)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit cc5344e80faaeb0f3a408c4950d462ea03d4959b
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Mon Oct 10 10:05:39 2022 +0100
HADOOP-18468: Upgrade jettison to 1.5.1 to fix CVE-2022-40149 (#4937)
Contributed by PJ Fanning
---
LICENSE-binary | 2 +-
hadoop-project/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index ff72d373475..3ff026a0d6f 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -351,7 +351,7 @@ org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-jaxrs:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.jackson:jackson-xc:1.9.13
-org.codehaus.jettison:jettison:1.1
+org.codehaus.jettison:jettison:1.5.1
org.eclipse.jetty:jetty-annotations:9.4.48.v20220622
org.eclipse.jetty:jetty-http:9.4.48.v20220622
org.eclipse.jetty:jetty-io:9.4.48.v20220622
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index b2fd463d0e8..8c3a4b940cb 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1514,7 +1514,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.1</version>
+ <version>1.5.1</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HADOOP-18401. No ARM binaries in branch-3.3.x releases. (#4953)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 2a4d421c5c3192a9b542ad576c60533e0d0a2ba7
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Fri Oct 7 15:58:51 2022 +0100
HADOOP-18401. No ARM binaries in branch-3.3.x releases. (#4953)
Fix the branch-3.3 docker image and create-release scripts to work on arm 64 and macbook m1
Contributed by Ayush Saxena and Steve Loughran
---
dev-support/bin/create-release | 5 +++--
dev-support/docker/Dockerfile_aarch64 | 23 ++++++++++++----------
.../dev-support/jdiff-workaround.patch | 6 +++---
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 19f17cb3666..fc0602ab186 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -205,7 +205,8 @@ function set_defaults
DOCKERRAN=false
CPU_ARCH=$(echo "$MACHTYPE" | cut -d- -f1)
- if [ "$CPU_ARCH" = "aarch64" ]; then
+ if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
+ echo "Using aarch64 docker file"
DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_aarch64"
fi
@@ -513,7 +514,7 @@ function dockermode
# we always force build with the OpenJDK JDK
# but with the correct version
- if [ "$CPU_ARCH" = "aarch64" ]; then
+ if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-arm64"
else
echo "ENV JAVA_HOME /usr/lib/jvm/java-${JVM_VERSION}-openjdk-amd64"
diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64
index 80e813bb316..bd6e7acc463 100644
--- a/dev-support/docker/Dockerfile_aarch64
+++ b/dev-support/docker/Dockerfile_aarch64
@@ -17,7 +17,7 @@
# Dockerfile for installing the necessary dependencies for building Hadoop.
# See BUILDING.txt.
-FROM ubuntu:bionic
+FROM ubuntu:focal
WORKDIR /root
@@ -53,6 +53,7 @@ RUN apt-get -q update \
gcc \
git \
gnupg-agent \
+ hugo \
libbcprov-java \
libbz2-dev \
libcurl4-openssl-dev \
@@ -63,10 +64,13 @@ RUN apt-get -q update \
libsnappy-dev \
libssl-dev \
libtool \
- libzstd1-dev \
+ libzstd-dev \
locales \
make \
maven \
+ nodejs \
+ node-yarn \
+ npm \
openjdk-11-jdk \
openjdk-8-jdk \
phantomjs \
@@ -74,7 +78,6 @@ RUN apt-get -q update \
pkg-config \
python2.7 \
python3 \
- python3-dev \
python3-pip \
python3-pkg-resources \
python3-setuptools \
@@ -110,7 +113,7 @@ RUN mkdir -p /opt/spotbugs \
ENV SPOTBUGS_HOME /opt/spotbugs
######
-# Install Google Protobuf 3.7.1 (3.0.0 ships with Bionic)
+# Install Google Protobuf 3.7.1 (3.6.1 ships with Focal)
######
# hadolint ignore=DL3003
RUN mkdir -p /opt/protobuf-src \
@@ -132,6 +135,12 @@ ENV PATH "${PATH}:/opt/protobuf/bin"
####
RUN pip3 install pylint==2.6.0 python-dateutil==2.8.1
+####
+# Install bower
+####
+# hadolint ignore=DL3008
+RUN npm install -g bower@1.8.8
+
###
# Avoid out of memory errors in builds
###
@@ -149,12 +158,6 @@ ENV QT_QPA_PLATFORM offscreen
# YETUS CUT HERE
###
-# Hugo static website generator (for new hadoop site docs)
-RUN curl -L -o hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.58.3/hugo_0.58.3_Linux-ARM64.deb \
- && dpkg --install hugo.deb \
- && rm hugo.deb
-
-
# Add a welcome message and environment checks.
COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh
RUN chmod 755 /root/hadoop_env_checks.sh
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch b/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
index 2bd7b63f017..26eb53a990b 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
-index a277abd6e13..1d131d5db6e 100644
+index fef8c4b7e4b..8d2b9339706 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
@@ -42,18 +42,6 @@
@@ -14,7 +14,7 @@ index a277abd6e13..1d131d5db6e 100644
- * the annotations of the source object.)
- * @param desc the description of the source (or null. See above.)
- * @return the source object
-- * @exception MetricsException
+- * @exception MetricsException Metrics Exception.
- */
- public abstract <T> T register(String name, String desc, T source);
-
@@ -38,7 +38,7 @@ index a277abd6e13..1d131d5db6e 100644
+ * the annotations of the source object.)
+ * @param desc the description of the source (or null. See above.)
+ * @return the source object
- * @exception MetricsException
+ * @exception MetricsException Metrics Exception.
*/
- public abstract <T extends MetricsSink>
- T register(String name, String desc, T sink);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org