diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cf347fea..39f07716a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ All notable changes to this project will be documented in this file. - yq: Bump products to use `4.45.2` ([#1090]). - cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]). - vector: Bump to `0.46.1` ([#1098]). +- hive: Bump Hadoop to 3.4.1, and AWS bundle to 2.24.6 ([#1100]). ### Fixed @@ -90,6 +91,7 @@ All notable changes to this project will be documented in this file. [#1093]: https://github.com/stackabletech/docker-images/pull/1093 [#1097]: https://github.com/stackabletech/docker-images/pull/1097 [#1098]: https://github.com/stackabletech/docker-images/pull/1098 +[#1100]: https://github.com/stackabletech/docker-images/pull/1100 ## [25.3.0] - 2025-03-21 diff --git a/hive/Dockerfile b/hive/Dockerfile index 65c7209b5..fbc0c5415 100644 --- a/hive/Dockerfile +++ b/hive/Dockerfile @@ -71,7 +71,9 @@ ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/j # Add S3 Support for Hive (support for s3a://) cp /stackable/hadoop-${HADOOP}/share/hadoop/tools/lib/hadoop-aws-${HADOOP}.jar /stackable/apache-hive-metastore-${PRODUCT}-bin/lib/ -cp /stackable/hadoop-${HADOOP}/share/hadoop/tools/lib/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE}.jar /stackable/apache-hive-metastore-${PRODUCT}-bin/lib/ +# According to https://hadoop.apache.org/docs/stable/hadoop-aws/tools/hadoop-aws/aws_sdk_upgrade.html, the jar filename has changed from +# aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE}.jar to bundle-${AWS_JAVA_SDK_BUNDLE}.jar +cp /stackable/hadoop-${HADOOP}/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE}.jar /stackable/apache-hive-metastore-${PRODUCT}-bin/lib/ # Add Azure ABFS support (support for abfs://) cp /stackable/hadoop-${HADOOP}/share/hadoop/tools/lib/hadoop-azure-${HADOOP}.jar /stackable/apache-hive-metastore-${PRODUCT}-bin/lib/ diff --git a/hive/versions.py b/hive/versions.py index 0e00a7d9f..cb6364a75 100644 --- a/hive/versions.py +++ b/hive/versions.py @@ -5,9 +5,9 @@ # Hive 3 must be built with Java 8 but will run on Java 11 "java-base": "11", "java-devel": "8", - "hadoop": "3.3.6", - # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6 - "aws_java_sdk_bundle": "1.12.367", + "hadoop": "3.4.1", + # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1 + "aws_java_sdk_bundle": "2.24.6", "azure_storage": "7.0.1", "azure_keyvault_core": "1.0.0", }, @@ -17,9 +17,9 @@ # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11 "java-base": "11", "java-devel": "8", - "hadoop": "3.3.6", - # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6 - "aws_java_sdk_bundle": "1.12.367", + "hadoop": "3.4.1", + # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1 + "aws_java_sdk_bundle": "2.24.6", "azure_storage": "7.0.1", "azure_keyvault_core": "1.0.0", }, @@ -29,9 +29,9 @@ # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11 "java-base": "11", "java-devel": "8", - "hadoop": "3.3.6", - # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6 - "aws_java_sdk_bundle": "1.12.367", + "hadoop": "3.4.1", + # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1 + "aws_java_sdk_bundle": "2.24.6", "azure_storage": "7.0.1", "azure_keyvault_core": "1.0.0", }, diff --git a/java-base/versions.py b/java-base/versions.py index 1c6f7706d..d4a1b095f 100644 --- a/java-base/versions.py +++ b/java-base/versions.py @@ -25,6 +25,6 @@ }, { "product": "24", - "vector": "0.43.1", + "vector": "0.46.1", }, ]