From 7bb708888f5949cebaaeb96942f10d3d22e8f798 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 26 Mar 2026 11:49:00 +0100
Subject: [PATCH] Address review: fix pkg.skip.bootjar precedence and remove
 unused surefire.version

Remove <pkg.skip.bootjar>false</pkg.skip.bootjar> from all child
module <properties> blocks. The root POM already defaults it to false,
and child declarations block the skip-pkg profile override, so
-Dpkg.skip=true was never actually skipping spring-boot:repackage.

Also remove the unused surefire.version property (superseded by
maven-surefire-plugin.version).
---
 application/pom.xml     | 1 -
 edqs/pom.xml            | 1 -
 monitoring/pom.xml      | 1 -
 msa/js-executor/pom.xml | 1 -
 msa/vc-executor/pom.xml | 1 -
 msa/web-ui/pom.xml      | 1 -
 pom.xml                 | 1 -
 transport/coap/pom.xml  | 1 -
 transport/http/pom.xml  | 1 -
 transport/lwm2m/pom.xml | 1 -
 transport/mqtt/pom.xml  | 1 -
 transport/snmp/pom.xml  | 1 -
 12 files changed, 12 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 5b699fab24..af5d26070d 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -35,7 +35,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>thingsboard</pkg.name>
diff --git a/edqs/pom.xml b/edqs/pom.xml
index f528d56097..c1c471ef62 100644
--- a/edqs/pom.xml
+++ b/edqs/pom.xml
@@ -33,7 +33,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-edqs</pkg.name>
diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index ff1af3ab7f..e15b603449 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -33,7 +33,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-monitoring</pkg.name>
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 6f57b5ddd2..87b3657d4a 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -37,7 +37,6 @@
         <docker.name>tb-js-executor</docker.name>
         <pkg.name>tb-js-executor</pkg.name>
         <pkg.type>js</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>
diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml
index faa41e9e55..c476d1725c 100644
--- a/msa/vc-executor/pom.xml
+++ b/msa/vc-executor/pom.xml
@@ -35,7 +35,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-vc-executor</pkg.name>
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index efbdb693c8..2307818944 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -39,7 +39,6 @@
         <docker.name>tb-web-ui</docker.name>
         <pkg.name>tb-web-ui</pkg.name>
         <pkg.type>js</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>
diff --git a/pom.xml b/pom.xml
index 50367c23fa..6eec204fe7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,6 @@
         <paho.client.version>1.2.5</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
-        <surefire.version>3.5.4</surefire.version>
         <jar-plugin.version>3.5.0</jar-plugin.version>
         <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
         <maven-install-plugin.version>3.1.4</maven-install-plugin.version>
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 6fa7021197..6e67ff417e 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -34,7 +34,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-coap-transport</pkg.name>
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index ae08bf63c3..39b57240fb 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -34,7 +34,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-http-transport</pkg.name>
diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml
index daa078699d..ebe1e6bcca 100644
--- a/transport/lwm2m/pom.xml
+++ b/transport/lwm2m/pom.xml
@@ -34,7 +34,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-lwm2m-transport</pkg.name>
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index e5eed8cd5a..856df50aa0 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -34,7 +34,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-mqtt-transport</pkg.name>
diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml
index 370f2ce325..f57e99b113 100644
--- a/transport/snmp/pom.xml
+++ b/transport/snmp/pom.xml
@@ -36,7 +36,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.type>java</pkg.type>
-        <pkg.skip.bootjar>false</pkg.skip.bootjar>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
         <pkg.name>tb-snmp-transport</pkg.name>