This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6cfd7dc078 HDDS-8911. Update Hadoop to 3.3.6 (#4985)
6cfd7dc078 is described below
commit 6cfd7dc078956122a8546b7833728db1acaf2a08
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Tue Jun 27 09:33:11 2023 -0700
HDDS-8911. Update Hadoop to 3.3.6 (#4985)
---
hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure/.env | 2 +-
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 3 ---
hadoop-ozone/dist/src/main/license/jar-report.txt | 3 ---
hadoop-ozone/dist/src/main/smoketest/.env | 2 +-
pom.xml | 2 +-
8 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index 3f96c13980..b55a1a97ed 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -33,7 +33,7 @@ export OZONE_DIR=/opt/ozone
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.5; do
+for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.6; do
export HADOOP_VERSION
export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
# Check if $HADOOP_VERSION starts with the prefix "3.3."
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env
index 1ddd45333e..5f3e96ed61 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env
@@ -15,7 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_VERSION=3
+HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
index 83b68887a9..c3a2c5329a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
@@ -16,7 +16,7 @@
HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=apache/hadoop
-HADOOP_VERSION=3.3.5
+HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
index 1ddd45333e..5f3e96ed61 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env
@@ -15,7 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_VERSION=3
+HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index d02c3bcceb..ab39f190b6 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -358,8 +358,6 @@ Apache License 2.0
jakarta.validation:jakarta.validation-api
javax.enterprise:cdi-api
javax.inject:javax.inject
- net.minidev:accessors-smart
- net.minidev:json-smart
net.java.dev.jna:jna
net.java.dev.jna:jna-platform
org.apache.commons:commons-compress
@@ -496,7 +494,6 @@ BSD 3-Clause
com.google.re2j:re2j
com.jcraft:jsch
com.thoughtworks.paranamer:paranamer
- org.ow2.asm:asm
BSD 2-Clause
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index d54591b4a9..9cb4a2c3f3 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -1,11 +1,9 @@
-share/ozone/lib/accessors-smart.jar
share/ozone/lib/activation.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/aopalliance.jar
share/ozone/lib/aopalliance-repackaged.jar
-share/ozone/lib/asm.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/aspectjweaver.jar
share/ozone/lib/awaitility.jar
@@ -156,7 +154,6 @@ share/ozone/lib/jooq.jar
share/ozone/lib/jooq-meta.jar
share/ozone/lib/jsch.jar
share/ozone/lib/json-simple.jar
-share/ozone/lib/json-smart.jar
share/ozone/lib/jsp-api.jar
share/ozone/lib/jsr305.jar
share/ozone/lib/jsr311-api.jar
diff --git a/hadoop-ozone/dist/src/main/smoketest/.env
b/hadoop-ozone/dist/src/main/smoketest/.env
index 47a25e1ce8..c7c8e574e8 100644
--- a/hadoop-ozone/dist/src/main/smoketest/.env
+++ b/hadoop-ozone/dist/src/main/smoketest/.env
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-HADOOP_VERSION=3
\ No newline at end of file
+HADOOP_VERSION=${hadoop.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0d8e0c7153..459c4547c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<properties>
<hadoop2.version>2.7.3</hadoop2.version>
- <hadoop.version>3.3.5</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<!-- version for hdds/ozone components -->
<hdds.version>${ozone.version}</hdds.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
