Merge pull request #14577 from smatvienko-tb/packaging-deb-java-21-25

Packaging deb rpm compatibility with Java 21 and 25

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/
 

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/
 

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>

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/
 

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/
 

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/
 

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/
 

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/
 

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/
 

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 \

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"
@@ -132,6 +136,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"