Merge branch 'main' into feature/image-tools-revamp

# Conflicts:
#	stackable-base/Dockerfile

Author: lfrancke

.github/actions/publish-image/action.yml

@@ -129,19 +129,18 @@ runs:
         # TODO (@Techassi): Replace author with manufacturer, because it is
         # automated, see https://cyclonedx.org/docs/1.6/json/#metadata_component_manufacturer
         jq -s \
-          --arg description "$IMAGE_METADATA_DESCRIPTION" \
-          --arg name "$IMAGE_METADATA_NAME" \
+          --arg description "$IMAGE_METADATA_NAME. $IMAGE_METADATA_DESCRIPTION" \
           --arg purl "$PURL" \
           '{
               "metadata": {
                   "component": {
-                      "description": "$name. $description",
+                      "description": $description,
                       "supplier": {
                           "name": "Stackable GmbH",
                           "url": ["https://stackable.tech/"]
                       },
                       "author": "Stackable GmbH",
-                      "purl": "$purl",
+                      "purl": $purl,
                       "publisher": "Stackable GmbH"
                   }
               }

CHANGELOG.md

@@ -14,11 +14,14 @@ All notable changes to this project will be documented in this file.
 - hive: Add version `4.0.0` ([#818]).
 - trino: Add version `455` ([#822]).
 - trino-cli: Add version `455` ([#822]).
+- spark: Add version `3.5.2` ([#848]).
+- hadoop: Add patch "HADOOP-18516: Support Fixed SAS Token for ABFS Authentication" ([#852]).
 
 ### Changed
 
 - 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])
 
 ### Removed
 
@@ -28,11 +31,15 @@ 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]).
 
 ### Fixed
 
 - hbase: link to phoenix server jar ([#811]).
 
+[#783]: https://github.com/stackabletech/docker-images/pull/783
 [#797]: https://github.com/stackabletech/docker-images/pull/797
 [#802]: https://github.com/stackabletech/docker-images/pull/802
 [#809]: https://github.com/stackabletech/docker-images/pull/809
@@ -42,6 +49,9 @@ All notable changes to this project will be documented in this file.
 [#818]: https://github.com/stackabletech/docker-images/pull/818
 [#819]: https://github.com/stackabletech/docker-images/pull/819
 [#822]: https://github.com/stackabletech/docker-images/pull/822
+[#846]: https://github.com/stackabletech/docker-images/pull/846
+[#848]: https://github.com/stackabletech/docker-images/pull/848
+[#852]: https://github.com/stackabletech/docker-images/pull/852
 
 ## [24.7.0] - 2024-07-24
 

hadoop/stackable/patches/3.3.4/009-HADOOP-18516-3.3.4.patch

@@ -1,20 +1,6 @@
 versions = [
     # Also do not merge java-base with java below as "JAVA-BASE is not a valid identifier" in Dockerfiles, it's unfortunate but to fix this would require a bigger refactoring of names or the image tools
     # hbase-thirdparty is used to build the hbase-operator-tools and should be set to the version defined in the POM of HBase.
-    {
-        "product": "2.4.17",
-        "hbase_thirdparty": "4.1.5",
-        "hbase_operator_tools": "1.2.0",
-        "java-base": "11",
-        "java-devel": "11",
-        "async_profiler": "2.9",
-        "phoenix": "5.2.0",
-        "hbase_profile": "2.4",
-        "hadoop": "3.3.6",
-        "jmx_exporter": "1.0.1",  # update the stackable/jmx/config<version> folder too
-        "opa_authorizer": "",  # only for HBase 2.6.0
-        "delete_caches": "true",
-    },
     {
         "product": "2.4.18",
         "hbase_thirdparty": "4.1.5",

hadoop/stackable/patches/3.3.6/009-HADOOP-18516-3.3.6.patch

@@ -1,16 +1,4 @@
 versions = [
-    {
-        "product": "1.1.0",
-        "java-base": "11",
-        "java-devel": "11",
-        "jmx_exporter": "1.0.1",
-    },
-    {
-        "product": "1.1.1",
-        "java-base": "11",
-        "java-devel": "11",
-        "jmx_exporter": "1.0.1",
-    },
     {
         "product": "1.1.2",
         "java-base": "11",

hadoop/stackable/patches/3.4.0/006-HADOOP-18516-3.4.0.patch

@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "local>stackabletech/.github:renovate-config",
+    "github>stackabletech/.github:renovate-config",
     "docker:pinDigests"
   ]
 }

hbase/versions.py

@@ -3,6 +3,6 @@
 # Copy over the binary
 cp "$1" /app
 
-# And now try to find a BOM file named like the binary + .cdx.xml and copy it over as well if it exists
+# And now try to find a BOM file named like the binary + _bin.cdx.xml and copy it over as well if it exists
 base=$(basename "$1")
-find /src/rust/ -type f -name "$base.cdx.xml" -exec cp {} /app \;
+find /src/rust/ -type f -name "${base}_bin.cdx.xml" -exec cp {} /app \;