HDDS-8911. Update Hadoop to 3.3.6 #4985
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |||||
| # limitations under the License. | ||||||
|
|
||||||
| HDDS_VERSION=${hdds.version} | ||||||
| HADOOP_VERSION=3.3.6 | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| OZONE_RUNNER_VERSION=${docker.ozone-runner.version} | ||||||
| OZONE_RUNNER_IMAGE=apache/ozone-runner | ||||||
| OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -358,8 +358,6 @@ Apache License 2.0 | |
| jakarta.validation:jakarta.validation-api | ||
| javax.enterprise:cdi-api | ||
| javax.inject:javax.inject | ||
| 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 | ||
|
|
||
|
|
||
| BSD 2-Clause | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| share/ozone/lib/FastInfoset.jar | ||
|
Contributor
There was a problem hiding this comment. Nit: Three kinds of changes to
I would prefer to stick only to the first kind of change in this PR: @@ -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-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.jarRationale: The changes are in transitive dependencies, visible only in this file (no POM change). Reordering lines hides the real difference. Unfortunately which re-generates from scratch, causing such mixed changes. To avoid those, one can simply manually remove the unnecessary entries.
Contributor
Author
There was a problem hiding this comment. Yeah... I wasn't sure how the jar report is generated. Let's see if it is happy with this.
Contributor
There was a problem hiding this comment. It sorts both old (reference) and new lists exactly to avoid false positives due to difference in ozone/hadoop-ozone/dev-support/checks/dependency.sh Lines 31 to 32 in 4559ef4 So any order is fine as far as |
||
| 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-repackaged.jar | ||
| share/ozone/lib/aopalliance.jar | ||
| share/ozone/lib/aspectjrt.jar | ||
| share/ozone/lib/aspectjweaver.jar | ||
| share/ozone/lib/awaitility.jar | ||
|
|
@@ -26,8 +25,8 @@ share/ozone/lib/commons-configuration2.jar | |
| share/ozone/lib/commons-daemon.jar | ||
| share/ozone/lib/commons-digester.jar | ||
| share/ozone/lib/commons-io.jar | ||
| share/ozone/lib/commons-lang.jar | ||
| share/ozone/lib/commons-lang3.jar | ||
| share/ozone/lib/commons-logging.jar | ||
| share/ozone/lib/commons-net.jar | ||
| share/ozone/lib/commons-pool2.jar | ||
|
|
@@ -41,21 +40,20 @@ share/ozone/lib/disruptor.jar | |
| share/ozone/lib/dnsjava.jar | ||
| share/ozone/lib/error_prone_annotations.jar | ||
| share/ozone/lib/failureaccess.jar | ||
| share/ozone/lib/gethostname4j.jar | ||
| share/ozone/lib/grpc-api.jar | ||
| share/ozone/lib/grpc-context.jar | ||
| share/ozone/lib/grpc-core.jar | ||
| share/ozone/lib/grpc-netty.jar | ||
| share/ozone/lib/grpc-protobuf-lite.jar | ||
| share/ozone/lib/grpc-protobuf.jar | ||
| share/ozone/lib/grpc-stub.jar | ||
| share/ozone/lib/gson.jar | ||
| share/ozone/lib/guava-jre.jar | ||
| share/ozone/lib/guice-assistedinject.jar | ||
| share/ozone/lib/guice-bridge.jar | ||
| share/ozone/lib/guice-servlet.jar | ||
| share/ozone/lib/guice.jar | ||
| share/ozone/lib/hadoop-annotations.jar | ||
| share/ozone/lib/hadoop-auth.jar | ||
| share/ozone/lib/hadoop-common.jar | ||
|
|
@@ -76,8 +74,8 @@ share/ozone/lib/hdds-hadoop-dependency-server.jar | |
| share/ozone/lib/hdds-interface-admin.jar | ||
| share/ozone/lib/hdds-interface-client.jar | ||
| share/ozone/lib/hdds-interface-server.jar | ||
| share/ozone/lib/hdds-managed-rocksdb.jar | ||
| share/ozone/lib/hdds-rocks-native.jar | ||
| share/ozone/lib/hdds-server-framework.jar | ||
| share/ozone/lib/hdds-server-scm.jar | ||
| share/ozone/lib/hdds-tools.jar | ||
|
|
@@ -87,8 +85,8 @@ share/ozone/lib/hk2-utils.jar | |
| share/ozone/lib/hppc.jar | ||
| share/ozone/lib/httpasyncclient.jar | ||
| share/ozone/lib/httpclient.jar | ||
| share/ozone/lib/httpcore-nio.jar | ||
| share/ozone/lib/httpcore.jar | ||
| share/ozone/lib/httpmime.jar | ||
| share/ozone/lib/ion-java.jar | ||
| share/ozone/lib/istack-commons-runtime.jar | ||
|
|
@@ -148,15 +146,14 @@ share/ozone/lib/jetty-util.jar | |
| share/ozone/lib/jetty-webapp.jar | ||
| share/ozone/lib/jetty-xml.jar | ||
| share/ozone/lib/jmespath-java.jar | ||
| share/ozone/lib/jna-platform.jar | ||
| share/ozone/lib/jna.jar | ||
| share/ozone/lib/joda-time.jar | ||
| share/ozone/lib/jooq-codegen.jar | ||
| share/ozone/lib/jooq-meta.jar | ||
| share/ozone/lib/jooq.jar | ||
| share/ozone/lib/jsch.jar | ||
| share/ozone/lib/json-simple.jar | ||
| share/ozone/lib/jsp-api.jar | ||
| share/ozone/lib/jsr305.jar | ||
| share/ozone/lib/jsr311-api.jar | ||
|
|
@@ -173,13 +170,13 @@ share/ozone/lib/log4j-core.jar | |
| share/ozone/lib/metainf-services.jar | ||
| share/ozone/lib/metrics-core.jar | ||
| share/ozone/lib/netty-buffer.Final.jar | ||
| share/ozone/lib/netty-codec-http.Final.jar | ||
| share/ozone/lib/netty-codec-http2.Final.jar | ||
| share/ozone/lib/netty-codec-socks.Final.jar | ||
| share/ozone/lib/netty-codec.Final.jar | ||
| share/ozone/lib/netty-common.Final.jar | ||
| share/ozone/lib/netty-handler-proxy.Final.jar | ||
| share/ozone/lib/netty-handler.Final.jar | ||
| share/ozone/lib/netty-resolver.Final.jar | ||
| share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-aarch_64.jar | ||
| share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-x86_64.jar | ||
|
|
@@ -188,10 +185,10 @@ share/ozone/lib/netty-tcnative-boringssl-static.Final-osx-x86_64.jar | |
| share/ozone/lib/netty-tcnative-boringssl-static.Final-windows-x86_64.jar | ||
| share/ozone/lib/netty-tcnative-boringssl-static.Final.jar | ||
| share/ozone/lib/netty-tcnative-classes.Final.jar | ||
| share/ozone/lib/netty-transport-classes-epoll.Final.jar | ||
| share/ozone/lib/netty-transport-native-epoll.Final-linux-x86_64.jar | ||
| share/ozone/lib/netty-transport-native-unix-common.Final.jar | ||
| share/ozone/lib/netty-transport.Final.jar | ||
| share/ozone/lib/nimbus-jose-jwt.jar | ||
| share/ozone/lib/okhttp.jar | ||
| share/ozone/lib/okio.jar | ||
|
|
@@ -207,25 +204,25 @@ share/ozone/lib/ozone-csi.jar | |
| share/ozone/lib/ozone-datanode.jar | ||
| share/ozone/lib/ozone-filesystem-common.jar | ||
| share/ozone/lib/ozone-filesystem-hadoop2.jar | ||
| share/ozone/lib/ozone-filesystem-hadoop3-client.jar | ||
| share/ozone/lib/ozone-filesystem-hadoop3.jar | ||
| share/ozone/lib/ozone-filesystem.jar | ||
| share/ozone/lib/ozone-httpfsgateway.jar | ||
| share/ozone/lib/ozone-insight.jar | ||
| share/ozone/lib/ozone-interface-client.jar | ||
| share/ozone/lib/ozone-interface-storage.jar | ||
| share/ozone/lib/ozone-manager.jar | ||
| share/ozone/lib/ozone-recon.jar | ||
| share/ozone/lib/ozone-reconcodegen.jar | ||
| share/ozone/lib/ozone-s3-secret-store.jar | ||
| share/ozone/lib/ozone-s3gateway.jar | ||
| share/ozone/lib/ozone-tools.jar | ||
| share/ozone/lib/perfmark-api.jar | ||
| share/ozone/lib/picocli.jar | ||
| share/ozone/lib/proto-google-common-protos.jar | ||
| share/ozone/lib/protobuf-java-util.jar | ||
| share/ozone/lib/protobuf-java.jar | ||
| share/ozone/lib/protobuf-java.jar | ||
| share/ozone/lib/ranger-intg.jar | ||
| share/ozone/lib/ranger-plugin-classloader.jar | ||
| share/ozone/lib/ranger-plugins-audit.jar | ||
|
|
@@ -243,12 +240,12 @@ share/ozone/lib/ratis-thirdparty-misc.jar | |
| share/ozone/lib/ratis-tools.jar | ||
| share/ozone/lib/re2j.jar | ||
| share/ozone/lib/reflections.jar | ||
| share/ozone/lib/reload4j.jar | ||
| share/ozone/lib/rocksdb-checkpoint-differ.jar | ||
| share/ozone/lib/rocksdbjni.jar | ||
| share/ozone/lib/simpleclient.jar | ||
| share/ozone/lib/simpleclient_common.jar | ||
| share/ozone/lib/simpleclient_dropwizard.jar | ||
| share/ozone/lib/slf4j-api.jar | ||
| share/ozone/lib/slf4j-reload4j.jar | ||
| share/ozone/lib/snakeyaml.jar | ||
|
|
@@ -258,12 +255,12 @@ share/ozone/lib/spring-core.jar | |
| share/ozone/lib/spring-jdbc.jar | ||
| share/ozone/lib/spring-tx.jar | ||
| share/ozone/lib/sqlite-jdbc.jar | ||
| share/ozone/lib/stax-ex.jar | ||
| share/ozone/lib/stax2-api.jar | ||
| share/ozone/lib/txw2.jar | ||
| share/ozone/lib/vault-java-driver.jar | ||
| share/ozone/lib/weld-servlet-shaded.Final.jar | ||
| share/ozone/lib/woodstox-core.jar | ||
| share/ozone/lib/zookeeper-jute.jar | ||
| share/ozone/lib/zookeeper.jar | ||
| share/ozone/lib/zstd-jni.jar | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -14,4 +14,4 @@ | |||||
| # See the License for the specific language governing permissions and | ||||||
| # limitations under the License. | ||||||
|
|
||||||
| HADOOP_VERSION=3.3.6 | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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.6</hadoop.version> | ||
|
|
||
| <!-- version for hdds/ozone components --> | ||
| <hdds.version>${ozone.version}</hdds.version> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now that the Docker image has the same version as Hadoop itself, we can change this to avoid the need for future updates: