diff --git a/conf.py b/conf.py index 71a04146b..7e944fbf5 100644 --- a/conf.py +++ b/conf.py @@ -71,6 +71,7 @@ { 'product': '2.3.9', 'hadoop': '2.10.1', + 'jackson_dataformat_xml': '2.7.9', 'aws_java_sdk_bundle': '1.11.271', 'azure_storage': '7.0.1', 'azure_keyvault_core': '1.0.0', @@ -78,6 +79,7 @@ { 'product': '3.1.3', 'hadoop': '3.3.3', + 'jackson_dataformat_xml': '2.12.3', 'aws_java_sdk_bundle': '1.11.1026', 'azure_storage': '7.0.1', 'azure_keyvault_core': '1.0.0', diff --git a/hive/CHANGELOG.md b/hive/CHANGELOG.md index 67435d151..763fa6cc5 100644 --- a/hive/CHANGELOG.md +++ b/hive/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [Unreleased] + +### Added + +- Added `jackson-dataformat-xml-2.7.9.jar` (2.3.9) and `jackson-dataformat-xml-2.12.3.jar` (3.1.3) for XmlFormat conversion for logging ([#293]). + +[#293]: https://github.com/stackabletech/docker-images/pull/293 + ## [hive2.3.9-stackable0.7.0] [hive3.1.3-stackable0.3.0] - 2023-01-16 ### Changed diff --git a/hive/Dockerfile b/hive/Dockerfile index ae897abcf..cfa453ea3 100644 --- a/hive/Dockerfile +++ b/hive/Dockerfile @@ -2,6 +2,7 @@ FROM docker.stackable.tech/stackable/java-base:11-stackable0.3.0@sha256:5c7f9e72 ARG PRODUCT ARG HADOOP +ARG JACKSON_DATAFORMAT_XML ARG AWS_JAVA_SDK_BUNDLE ARG AZURE_STORAGE ARG AZURE_KEYVAULT_CORE @@ -63,7 +64,14 @@ RUN curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_promet -o /stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar && \ chmod -x /stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar +# Logging +RUN rm /stackable/hive/lib/log4j-slf4j-impl* && \ + curl https://repo.stackable.tech/repository/packages/hive-jackson-dataformat-xml/${PRODUCT}/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar \ + -o /stackable/hive/lib/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar && \ + chmod -x /stackable/hive/lib/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar + ENV HADOOP_HOME=/stackable/hadoop +ENV HIVE_HOME=/stackable/hive # === # Mitigation for CVE-2021-44228 (Log4Shell)