Merge branch 'main' into feat/user-handling-pt2

Author: NickLarsenNZ

.gitattributes

@@ -0,0 +1 @@
+nix/** linguist-generated

CHANGELOG.md

@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
 - trino: Add version `455` ([#822]).
 - trino-cli: Add version `455` ([#822]).
 - spark: Add version `3.5.2` ([#848]).
-- statsd-exporter: Bump version to 0.27.1 ([#866], [#879]).
+- statsd-exporter: Bump version to `0.27.1` ([#866], [#879]).
 - hadoop: Add patch "HADOOP-18516: Support Fixed SAS Token for ABFS Authentication" ([#852]).
 - hbase: Add hadoop-azure.jar to the lib directory to support the Azure Blob Filesystem and
   the Azure Data Lake Storage ([#853]).
@@ -27,8 +27,10 @@ All notable changes to this project will be documented in this file.
 
 - ci: Rename local actions, adjust action inputs and outputs, add definition
   README file ([#819]).
-- Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783])
-- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872])
+- Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783]).
+- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872]).
+- java: migrate to temurin jdk/jre ([#894]).
+- tools: bump kubectl to `1.31.1` and jq to `1.7.1` ([#896]).
 - Make username, user id, group id configurable, use numeric ids everywhere, change group of all files to 0 ([#849], [#890])
 
 ### Removed
@@ -39,13 +41,14 @@ All notable changes to this project will be documented in this file.
 - kafka: Remove versions `3.4.1`, `3.6.1`, `3.6.2` ([#813]).
 - trino: Remove versions `414`, `442` ([#822]).
 - trino-cli: Remove version `451` ([#822]).
-- hbase: Remove 2.4.17 ([#846]).
-- omid: Remove 1.1.0 and 1.1.1 ([#846]).
-- spark: Remove 3.4.2 and 3.4.3 ([#848]).
-- statsd-exporter: Remove 0.26.1 ([#866]).
-- superset: Remove 2.1.3, 3.1.0 and 3.1.3 ([#866]).
-- zookeeper: Remove 3.8.4 ([#851]).
-- nifi: Remove 1.21.0 and 1.25.0 ([#868]).
+- hbase: Remove `2.4.17` ([#846]).
+- omid: Remove `1.1.0` and `1.1.1` ([#846]).
+- spark: Remove `3.4.2` and `3.4.3` ([#848]).
+- statsd-exporter: Remove `0.26.1` ([#866]).
+- superset: Remove `2.1.3`, `3.1.0` and `3.1.3` ([#866]).
+- zookeeper: Remove `3.8.4` ([#851]).
+- nifi: Remove `1.21.0` and `1.25.0` ([#868]).
+- druid: Remove `28.0.1` ([#880]).
 
 ### Fixed
 
@@ -76,9 +79,12 @@ All notable changes to this project will be documented in this file.
 [#877]: https://github.com/stackabletech/docker-images/pull/877
 [#878]: https://github.com/stackabletech/docker-images/pull/878
 [#879]: https://github.com/stackabletech/docker-images/pull/879
+[#880]: https://github.com/stackabletech/docker-images/pull/880
 [#881]: https://github.com/stackabletech/docker-images/pull/881
 [#882]: https://github.com/stackabletech/docker-images/pull/882
 [#890]: https://github.com/stackabletech/docker-images/pull/890
+[#894]: https://github.com/stackabletech/docker-images/pull/894
+[#896]: https://github.com/stackabletech/docker-images/pull/896
 
 ## [24.7.0] - 2024-07-24
 

druid/versions.py

@@ -5,16 +5,6 @@
         "java-devel": "11",
         "authorizer": "0.5.0",
     },
-    {
-        "product": "28.0.1",
-        # Java 17 should be fully supported as of 27.0.0 https://github.com/apache/druid/releases#27.0.0-highlights-java-17-support
-        # Did not work in a quick test due to reflection error:
-        # Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class
-        # java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError
-        "java-base": "11",
-        "java-devel": "11",
-        "authorizer": "0.5.0",
-    },
     {
         "product": "30.0.0",
         # https://druid.apache.org/docs/30.0.0/operations/java/

hive/versions.py

@@ -4,7 +4,7 @@
         "jmx_exporter": "1.0.1",
         # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
         "java-base": "11",
-        "java-devel": "1.8.0",
+        "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",
@@ -16,7 +16,7 @@
         "jmx_exporter": "1.0.1",
         # Hive 3 must be built with Java 8 but will run on Java 11
         "java-base": "11",
-        "java-devel": "1.8.0",
+        "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",

java-base/Dockerfile

@@ -17,13 +17,20 @@ LABEL name="Stackable image for OpenJDK" \
     summary="The Stackable OpenJDK base image." \
     description="This image is the base image for all Stackable Java product images."
 
-# We need to use EPEL, as openjdk 22 is not shipped with UBI9
-RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+# See: https://adoptium.net/en-gb/installation/linux/#_centosrhelfedora_instructions
+RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
+[Adoptium]
+name=Adoptium
+baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
+EOF
 
 RUN microdnf update && \
     microdnf install \
-    # Obviously needed to run Java programs
-    java-${PRODUCT}-openjdk-headless \
+    # Needed to run Java programs
+    "temurin-${PRODUCT}-jre" \
     # Needed, because otherwise e.g. Zookeeper fails with
     # Caused by: java.io.FileNotFoundException: /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat (No such file or directory)
     tzdata-java \
@@ -34,7 +41,7 @@ RUN microdnf update && \
 
 COPY java-base/licenses /licenses
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
+ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jre"
 
 # This image doesn't include the development packages for Java.
 # For images that need the devel package (ex. Spark) use this env variable to

java-base/versions.py

@@ -1,6 +1,6 @@
 versions = [
     {
-        "product": "1.8.0",
+        "product": "8",
         "vector": "0.41.1",
     },
     {

java-devel/Dockerfile

@@ -9,8 +9,15 @@ FROM stackable/image/stackable-base
 
 ARG PRODUCT
 
-# We need to use EPEL, as openjdk 22 is not shipped with UBI9
-RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+# See: https://adoptium.net/en-gb/installation/linux/#_centosrhelfedora_instructions
+RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
+[Adoptium]
+name=Adoptium
+baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
+EOF
 
 RUN microdnf update && \
     microdnf install -y \
@@ -27,9 +34,10 @@ RUN microdnf update && \
     gettext \
     # For the apply_patches.sh script
     git \
-    # needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
+    # Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
     hostname \
-    java-"${PRODUCT}"-openjdk-devel \
+    # Needed for compiling Java projects
+    "temurin-${PRODUCT}-jdk" \
     krb5-devel \
     libcurl-devel \
     make \
@@ -46,7 +54,7 @@ RUN microdnf update && \
     microdnf clean all && \
     rm -rf /var/cache/yum
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
+ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
 
 COPY --chown=stackable:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml
 

java-devel/versions.py

@@ -1,6 +1,6 @@
 versions = [
     {
-        "product": "1.8.0",
+        "product": "8",
         "stackable-base": "1.0.0",
     },
     {