feat(opensearch): Add version 3.4.0 (#1391)

* opensearch: Add OpenSearch 3.4.0

* opensearch: Update the CycloneDX Gradle Plugin to version 3.1.0

* opensearch: Fix CycloneDX report path in OpenSearch 3.1.0

* opensearch: Make scripts in the security-plugin executable

* opensearch: Upgrade the CycloneDX Gradle Plugins to the latest possible versions

* Update changelog

Author: siegfriedweber

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - hive: Build [hive-metastore-opa-authorizer](https://github.com/boschglobal/hive-metastore-opa-authorizer) from source and add to image ([#1340]).
 - hive: Add `4.2.0` ([#1356]).
 - nifi: Add patches to replace process group root ID placeholder ([#1358]).
+- opensearch: Add `3.4.0` ([#1391]).
 - testing-tools: build testing tools subimages in workflow ([#1366]).
 
 ### Changed
@@ -48,6 +49,7 @@ All notable changes to this project will be documented in this file.
 [#1387]: https://github.com/stackabletech/docker-images/pull/1387
 [#1388]: https://github.com/stackabletech/docker-images/pull/1388
 [#1389]: https://github.com/stackabletech/docker-images/pull/1389
+[#1391]: https://github.com/stackabletech/docker-images/pull/1391
 [#1393]: https://github.com/stackabletech/docker-images/pull/1393
 [#1394]: https://github.com/stackabletech/docker-images/pull/1394
 

opensearch/Dockerfile

@@ -84,6 +84,7 @@ RUN <<EOF
 unzip opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
 rm opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
 mv config /stackable/opensearch-${PRODUCT_VERSION}/config/opensearch-security
+chmod 755 tools/*.sh
 EOF
 
 WORKDIR /stackable/opensearch-prometheus-exporter
@@ -212,17 +213,17 @@ COPY \
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
-    /stackable/src/opensearch/patchable-work/worktree/${PRODUCT_VERSION}/build/reports/bom.json \
+    /stackable/src/opensearch/patchable-work/worktree/${PRODUCT_VERSION}/build/reports/cyclonedx/bom.json \
     /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-security-plugin \
-    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN_VERSION}/build/reports/bom.json \
+    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN_VERSION}/build/reports/cyclonedx/bom.json \
     /stackable/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-prometheus-exporter \
-    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}/build/reports/bom.json \
+    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}/build/reports/cyclonedx/bom.json \
     /stackable/opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \

opensearch/boil-config.toml

@@ -28,3 +28,34 @@ jdk-base = "21"
 "opensearch-system-templates-plugin-version" = "3.1.0.0"
 "opensearch-ubi-plugin-version" = "3.1.0.0"
 "query-insights-plugin-version" = "3.1.0.0"
+
+[versions."3.4.0".local-images]
+java-devel = "24"
+jdk-base = "24"
+"opensearch/security-plugin" = "3.4.0.0"
+"opensearch/opensearch-prometheus-exporter" = "3.4.0.0"
+
+[versions."3.4.0".build-arguments]
+"opensearch-alerting-plugin-version" = "3.4.0.0"
+"opensearch-job-scheduler-plugin-version" = "3.4.0.0"
+"opensearch-anomaly-detection-plugin-version" = "3.4.0.0"
+"opensearch-asynchronous-search-plugin-version" = "3.4.0.0"
+"opensearch-cross-cluster-replication-plugin-version" = "3.4.0.0"
+"opensearch-custom-codecs-plugin-version" = "3.4.0.0"
+"opensearch-flow-framework-plugin-version" = "3.4.0.0"
+"opensearch-geospatial-plugin-version" = "3.4.0.0"
+"opensearch-index-management-plugin-version" = "3.4.0.0"
+"opensearch-knn-plugin-version" = "3.4.0.0"
+"opensearch-ml-plugin-version" = "3.4.0.0"
+"opensearch-neural-search-plugin-version" = "3.4.0.0"
+"opensearch-notifications-core-plugin-version" = "3.4.0.0"
+"opensearch-notifications-plugin-version" = "3.4.0.0"
+"opensearch-observability-plugin-version" = "3.4.0.0"
+"opensearch-reports-scheduler-plugin-version" = "3.4.0.0"
+"opensearch-search-relevance-plugin-version" = "3.4.0.0"
+"opensearch-security-analytics-plugin-version" = "3.4.0.0"
+"opensearch-skills-plugin-version" = "3.4.0.0"
+"opensearch-sql-plugin-version" = "3.4.0.0"
+"opensearch-system-templates-plugin-version" = "3.4.0.0"
+"opensearch-ubi-plugin-version" = "3.4.0.0"
+"query-insights-plugin-version" = "3.4.0.0"

opensearch/opensearch-prometheus-exporter/boil-config.toml

@@ -1,2 +1,7 @@
 [versions."3.1.0.0".local-images]
 java-devel = "21"
+
+[versions."3.4.0.0".local-images]
+# OpenSearch 3.4.0 bundles JDK 24, but the OpenSearch Prometheus Exporter can only be built with
+# JDK 21.
+java-devel = "21"

opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch

@@ -1,22 +1,22 @@
-From f89f753d1bc03598bfe129c367233fec6daee078 Mon Sep 17 00:00:00 2001
+From 57c1974f0c25ea3e9d1f92dfebdc707c5ec56801 Mon Sep 17 00:00:00 2001
 From: Benedikt Labrenz <benedikt@labrenz.org>
 Date: Tue, 12 Aug 2025 14:59:12 +0200
 Subject: Add CycloneDX plugin
 
 ---
- build.gradle | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ build.gradle | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/build.gradle b/build.gradle
-index 6c09118..d47ae14 100644
+index 6c09118..5401612 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -63,6 +63,20 @@ buildscript {
+@@ -63,6 +63,21 @@ buildscript {
      }
  }
 
 +plugins {
-+    id "org.cyclonedx.bom" version "2.3.1"
++    id "org.cyclonedx.bom" version "2.4.1"
 +}
 +
 +cyclonedxBom {
@@ -25,10 +25,18 @@ index 6c09118..d47ae14 100644
 +    skipConfigs = ["compileClasspath", "testCompileClasspath"]
 +    projectType = "application"
 +    schemaVersion = "1.6"
++    jsonOutput = file("build/reports/cyclonedx/bom.json")
 +    outputFormat = "json"
 +    componentVersion = versions.version
 +}
 +
  apply plugin: 'java'
  apply plugin: 'idea'
  apply plugin: 'opensearch.opensearchplugin'
+@@ -340,4 +355,4 @@ task bwcTestSuite(type: RestIntegTestTask) {
+ 
+ run {
+     useCluster testClusters.integTest
+-}
+\ No newline at end of file
++}

opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/patchable.toml

@@ -1 +1,2 @@
+mirror = "https://github.com/stackabletech/opensearch-prometheus-exporter"
 base = "df60b43e34d0f7fba6be9e003924a413764df85e"

opensearch/opensearch-prometheus-exporter/stackable/patches/3.4.0.0/0001-Add-CycloneDX-plugin.patch

@@ -0,0 +1,35 @@
+From 3f41ca69b26548c060f79a50327ef94e252196c9 Mon Sep 17 00:00:00 2001
+From: Benedikt Labrenz <benedikt@labrenz.org>
+Date: Tue, 12 Aug 2025 14:59:12 +0200
+Subject: Add CycloneDX plugin
+
+---
+ build.gradle | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/build.gradle b/build.gradle
+index e23dde9..2b16bb8 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -35,6 +35,21 @@ buildscript {
+     }
+ }
+ 
++plugins {
++    id "org.cyclonedx.bom" version "2.4.1"
++}
++
++cyclonedxBom {
++    includeConfigs = ["runtimeClasspath"]
++    includeLicenseText = false
++    skipConfigs = ["compileClasspath", "testCompileClasspath"]
++    projectType = "application"
++    schemaVersion = "1.6"
++    jsonOutput = file("build/reports/cyclonedx/bom.json")
++    outputFormat = "json"
++    componentVersion = versions.version
++}
++
+ apply plugin: 'java'
+ apply plugin: 'idea'
+ apply plugin: 'opensearch.opensearchplugin'

opensearch/opensearch-prometheus-exporter/stackable/patches/3.4.0.0/patchable.toml

@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/opensearch-prometheus-exporter"
+base = "13da5f22750d6665fb9fc7b0d171265e67948c34"

opensearch/security-plugin/boil-config.toml

@@ -1,2 +1,5 @@
 [versions."3.1.0.0".local-images]
 java-devel = "21"
+
+[versions."3.4.0.0".local-images]
+java-devel = "24"

opensearch/security-plugin/stackable/patches/3.1.0.0/0001-Add-CycloneDX-plugin.patch

@@ -1,25 +1,25 @@
-From eb596aa60cc21369d742b8d73604a2aac2a70f59 Mon Sep 17 00:00:00 2001
+From 15a57e452a302bcd5a8cce512a16905bfab43778 Mon Sep 17 00:00:00 2001
 From: dervoeti <lukas.krug@stackable.tech>
 Date: Tue, 22 Jul 2025 09:52:55 +0200
 Subject: Add CycloneDX plugin
 
 ---
- build.gradle | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ build.gradle | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/build.gradle b/build.gradle
-index bb2e65ab..314bb7be 100644
+index bb2e65ab..15a882a2 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -71,6 +71,7 @@ plugins {
      id 'eclipse'
      id "com.github.spotbugs" version "6.2.0"
      id "com.google.osdetector" version "1.7.3"
-+    id "org.cyclonedx.bom" version "2.3.1"
++    id "org.cyclonedx.bom" version "2.4.1"
  }
 
  allprojects {
-@@ -87,6 +88,16 @@ apply from: 'gradle/formatting.gradle'
+@@ -87,6 +88,17 @@ apply from: 'gradle/formatting.gradle'
  licenseFile = rootProject.file('LICENSE.txt')
  noticeFile = rootProject.file('NOTICE.txt')
 
@@ -29,6 +29,7 @@ index bb2e65ab..314bb7be 100644
 +    skipConfigs = ["compileClasspath", "testCompileClasspath"]
 +    projectType = "application"
 +    schemaVersion = "1.6"
++    jsonOutput = file("build/reports/cyclonedx/bom.json")
 +    outputFormat = "json"
 +    componentVersion = opensearch_build
 +}