From df0b5a356f444da3bec70631f43e171e33609110 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 10 Dec 2025 11:16:48 +0100
Subject: [PATCH 1/3] enable deb install on Java 17,21,25

---
 packaging/java/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle
index 499c34c412..d953bf231d 100644
--- a/packaging/java/build.gradle
+++ b/packaging/java/build.gradle
@@ -132,6 +132,8 @@ buildDeb {
     archiveFileName = "${pkgName}.deb"
 
     requires("openjdk-17-jre").or("java17-runtime").or("oracle-java17-installer").or("openjdk-17-jre-headless")
+            .or("openjdk-21-jre").or("java21-runtime").or("oracle-java21-installer").or("openjdk-21-jre-headless")
+            .or("openjdk-25-jre").or("java25-runtime").or("oracle-java25-installer").or("openjdk-25-jre-headless")
 
     from("${buildDir}/conf") {
         include "${pkgName}.conf"

From 618e563d3b8b51685a75d626c0ff3bb66f0ae114 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 11 Dec 2025 15:41:51 +0100
Subject: [PATCH 2/3] docker.base.image as a parameter

---
 msa/edqs/docker/Dockerfile               | 2 +-
 msa/monitoring/docker/Dockerfile         | 2 +-
 msa/pom.xml                              | 1 +
 msa/tb-node/docker/Dockerfile            | 2 +-
 msa/transport/coap/docker/Dockerfile     | 2 +-
 msa/transport/http/docker/Dockerfile     | 2 +-
 msa/transport/lwm2m/docker/Dockerfile    | 2 +-
 msa/transport/mqtt/docker/Dockerfile     | 2 +-
 msa/transport/snmp/docker/Dockerfile     | 2 +-
 msa/vc-executor-docker/docker/Dockerfile | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/msa/edqs/docker/Dockerfile b/msa/edqs/docker/Dockerfile
index e9099c09c5..2ecd46fa45 100644
--- a/msa/edqs/docker/Dockerfile
+++ b/msa/edqs/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-edqs.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/monitoring/docker/Dockerfile b/msa/monitoring/docker/Dockerfile
index a0b38bb3bd..d32f4d06d6 100644
--- a/msa/monitoring/docker/Dockerfile
+++ b/msa/monitoring/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-monitoring.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/pom.xml b/msa/pom.xml
index 6fcf7c3523..24cc67f4bf 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <main.dir>${basedir}/..</main.dir>
         <docker.repo>thingsboard</docker.repo>
+        <docker.base.image>thingsboard/openjdk17:bookworm-slim</docker.base.image>
         <dockerfile.skip>true</dockerfile.skip>
         <blackBoxTests.skip>true</blackBoxTests.skip>
         <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index 013a37ef9c..c084c9c15b 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY logback.xml start-tb-node.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile
index 1d88541096..f5aa18898c 100644
--- a/msa/transport/coap/docker/Dockerfile
+++ b/msa/transport/coap/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile
index d7c8622ace..f224a776ad 100644
--- a/msa/transport/http/docker/Dockerfile
+++ b/msa/transport/http/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/lwm2m/docker/Dockerfile b/msa/transport/lwm2m/docker/Dockerfile
index ec65d9a8a5..6b35776fce 100644
--- a/msa/transport/lwm2m/docker/Dockerfile
+++ b/msa/transport/lwm2m/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-lwm2m-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile
index 1502b9e3c0..270d357e4a 100644
--- a/msa/transport/mqtt/docker/Dockerfile
+++ b/msa/transport/mqtt/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/snmp/docker/Dockerfile b/msa/transport/snmp/docker/Dockerfile
index 0ec79e5148..713ff11607 100644
--- a/msa/transport/snmp/docker/Dockerfile
+++ b/msa/transport/snmp/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 COPY start-tb-snmp-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/vc-executor-docker/docker/Dockerfile b/msa/vc-executor-docker/docker/Dockerfile
index 3c65098c42..ae03092daf 100644
--- a/msa/vc-executor-docker/docker/Dockerfile
+++ b/msa/vc-executor-docker/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk17:bookworm-slim
+FROM ${docker.base.image}
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \

From c2b92c06513ccb6ff23a8055c9de1c641a29d894 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 11 Dec 2025 16:52:19 +0100
Subject: [PATCH 3/3] packaging rpm - allow Java 21 and Java 25 along with Java
 17

---
 packaging/java/build.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle
index d953bf231d..bb0c8a94de 100644
--- a/packaging/java/build.gradle
+++ b/packaging/java/build.gradle
@@ -92,7 +92,11 @@ buildRpm {
     archiveVersion = projectVersion.replace('-', '')
     archiveFileName = "${pkgName}.rpm"
 
-    requires("(java-17 or java-17-headless or jre-17 or jre-17-headless)") // .or() notation does work in RPM plugin
+    // Support Java 17 (existing), plus Java 21 and Java 25 for RPM-based distros
+    // Keep using RPM boolean expression syntax since .or() chaining is for DEB only
+    requires("(java-17 or java-17-headless or jre-17 or jre-17-headless or " +
+              "java-21 or java-21-headless or jre-21 or jre-21-headless or " +
+              "java-25 or java-25-headless or jre-25 or jre-25-headless)")
 
     from("${buildDir}/conf") {
         include "${pkgName}.conf"