Skip to content

Commit

Permalink
Revert "Bump hadoop.version from 3.3.6 to 3.4.0" (#1247)
Browse files Browse the repository at this point in the history
[Hadoop was upgraded to
`3.4.0`](https://github.com/hazelcast/hazelcast-mono/pull/1161), which
[uses the new Amazon
SDK](https://issues.apache.org/jira/browse/HADOOP-18073).

Beyond the issues [addressed
here](https://github.com/hazelcast/hazelcast-mono/pull/1182), there are
other [dependency
issues](https://github.com/hazelcast/hazelcast-enterprise/issues/7087)
and even outstanding authentication/exception handling issues:
> Expecting a throwable with root cause being an instance of:
  com.amazonaws.SdkClientException
but was an instance of:
  com.hazelcast.jet.JetException
{...}
Unable to load credentials from system settings. Access key must be
specified either via environment variable (AWS_ACCESS_KEY_ID) or system
property (aws.accessKeyId)

This makes the upgrade non-trivial, and testing is difficult as only
possible via Docker.

The simple fix for now is to revert this change.

Reverts:
- https://github.com/hazelcast/hazelcast-mono/pull/1161
- https://github.com/hazelcast/hazelcast-mono/pull/1180
- https://github.com/hazelcast/hazelcast-mono/pull/1182

Fixes: https://github.com/hazelcast/hazelcast-enterprise/issues/7087
GitOrigin-RevId: 72742287749ae71bde3e4e1b68cd93c38697744c
  • Loading branch information
JackPGreen authored and actions-user committed Apr 2, 2024
1 parent 3592240 commit 917ddae
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 19 deletions.
4 changes: 2 additions & 2 deletions extensions/hadoop-dist/files-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bundle</artifactId>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
4 changes: 0 additions & 4 deletions extensions/hadoop-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
12 changes: 0 additions & 12 deletions hazelcast-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<!--
Some JLine classes *technically* require Java 21 causing Enforcer failures
https://github.com/jline/jline3/issues/924
-->
<exclusion>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
Expand Down Expand Up @@ -820,14 +816,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<!--
Some JLine classes *technically* require Java 21 causing Enforcer failures
https://github.com/jline/jline3/issues/924
-->
<exclusion>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<debezium.version>1.9.8.Final</debezium.version>
<grpc.version>1.60.0</grpc.version>
<guava.version>33.1.0-jre</guava.version>
<hadoop.version>3.4.0</hadoop.version>
<hadoop.version>3.3.6</hadoop.version>
<h2.version>2.2.224</h2.version>
<!-- The Jackson version must match the version in EE, if you change this you must send EE PR as well -->
<jackson.version>2.14.2</jackson.version>
Expand Down

0 comments on commit 917ddae

Please sign in to comment.