From d2cde5ba941d694553ca51a5a96b20987fe68ef9 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Mon, 16 Mar 2026 13:46:38 +0100 Subject: [PATCH 1/5] Add per-format packaging skip flags (pkg.skip.bootjar/deb/rpm/zip) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduces four independent flags to skip individual packaging artifacts: -Dpkg.skip.bootjar=true skip spring-boot repackage (*-boot.jar) -Dpkg.skip.deb=true skip Gradle buildDeb + Maven attach-artifact -Dpkg.skip.rpm=true skip Gradle buildRpm -Dpkg.skip.zip=true skip maven-assembly-plugin Windows ZIP Adds -Dpkg.skip=true as a single convenience flag that sets all four at once. msa/pom.xml mirrors the skip-pkg profile to override its own package property (child POM properties have higher priority than parent profile properties in Maven). msa/* docker modules used ${basedir}/../.. (non-canonical) for main.dir. maven-enforcer-plugin 3.5.0's osIndependentNameMatch() compares file.toURI() vs file.getCanonicalFile().toURI() — these differ when the path contains '..', causing RequireFilesExist to report false-negative. Fix: replace ${basedir}/../.. with ${maven.multiModuleProjectDirectory}. --- TEST_FAST.md | 16 ++++- application/pom.xml | 6 +- edqs/pom.xml | 6 +- monitoring/pom.xml | 6 +- msa/black-box-tests/pom.xml | 2 +- msa/edqs/pom.xml | 52 +++++++++------ msa/js-executor/pom.xml | 2 +- msa/monitoring/pom.xml | 52 +++++++++------ msa/pom.xml | 35 ++++++++++ msa/tb-node/pom.xml | 52 +++++++++------ msa/tb/pom.xml | 93 ++++++++++++++++----------- msa/transport/coap/pom.xml | 52 +++++++++------ msa/transport/http/pom.xml | 52 +++++++++------ msa/transport/lwm2m/pom.xml | 52 +++++++++------ msa/transport/mqtt/pom.xml | 52 +++++++++------ msa/transport/snmp/pom.xml | 52 +++++++++------ msa/vc-executor-docker/pom.xml | 52 +++++++++------ msa/vc-executor/pom.xml | 6 +- msa/web-ui/pom.xml | 2 +- packaging/java/build.gradle | 3 + packaging/js/build.gradle | 3 + pom.xml | 114 +++++++++++++++++++++++++++------ transport/coap/pom.xml | 6 +- transport/http/pom.xml | 6 +- transport/lwm2m/pom.xml | 6 +- transport/mqtt/pom.xml | 6 +- transport/snmp/pom.xml | 6 +- 27 files changed, 529 insertions(+), 263 deletions(-) diff --git a/TEST_FAST.md b/TEST_FAST.md index 4d1e9dc9a7..eb2013c601 100644 --- a/TEST_FAST.md +++ b/TEST_FAST.md @@ -6,7 +6,9 @@ export MAVEN_OPTS="-Xmx1024m" export NODE_OPTIONS="--max_old_space_size=4096" export SUREFIRE_JAVA_OPTS="-Xmx1200m -Xss256k -XX:+ExitOnOutOfMemoryError" -mvn clean install -T6 -DskipTests +# Compile and install all modules, skip packaging artifacts not needed for tests +mvn clean install -T6 -DskipTests -Dpkg.skip=true + mvn test -pl='!application,!dao,!ui-ngx,!msa/js-executor,!msa/web-ui' -T4 mvn test -pl dao -Dparallel=packages -DforkCount=4 @@ -31,6 +33,18 @@ mvn test -pl application -Dtest=' ' -DforkCount=6 -Dparallel=packages -Dsurefire.rerunFailingTestsCount=2 -Dsurefire.failOnFlakeCount=5 ``` +## pkg.skip.* flags reference + +Use `-Dpkg.skip=true` to skip all packaging at once (equivalent to all four flags below). + +| Flag | Skips | Safe to skip for tests? | +|----------------------------|-------------------------------------------|--------------------------------------------------------------| +| `-Dpkg.skip=true` | All of the below (bootjar + deb + rpm + zip) | Yes | +| `-Dpkg.skip.bootjar=true` | `spring-boot:repackage` (`*-boot.jar`) | Yes — tests use the regular `.jar`, not the fat boot jar | +| `-Dpkg.skip.deb=true` | Gradle `buildDeb` + Maven `attach-artifact` | Yes — MSA docker modules copy the DEB from `target/` directly | +| `-Dpkg.skip.rpm=true` | Gradle `buildRpm` | Yes — no test depends on the RPM | +| `-Dpkg.skip.zip=true` | `maven-assembly-plugin` Windows ZIP | Yes — no test depends on the ZIP | + ## Testcontainers compatibility with the Docker API workaround In case your tests failed to run testcontainers due to unsupported Docker API version diff --git a/application/pom.xml b/application/pom.xml index 9535c5bd68..5b699fab24 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -35,7 +35,7 @@ UTF-8 ${basedir}/.. java - false + false process-resources package thingsboard @@ -493,10 +493,6 @@ org.apache.maven.plugins maven-assembly-plugin - - org.apache.maven.plugins - maven-install-plugin - org.xolstice.maven.plugins protobuf-maven-plugin diff --git a/edqs/pom.xml b/edqs/pom.xml index 5d0dce3c62..f528d56097 100644 --- a/edqs/pom.xml +++ b/edqs/pom.xml @@ -33,7 +33,7 @@ UTF-8 ${basedir}/.. java - false + false process-resources package tb-edqs @@ -179,10 +179,6 @@ org.apache.maven.plugins maven-assembly-plugin - - org.apache.maven.plugins - maven-install-plugin - org.xolstice.maven.plugins protobuf-maven-plugin diff --git a/monitoring/pom.xml b/monitoring/pom.xml index c09050ea17..ff1af3ab7f 100644 --- a/monitoring/pom.xml +++ b/monitoring/pom.xml @@ -33,7 +33,7 @@ UTF-8 ${basedir}/.. java - false + false process-resources package tb-monitoring @@ -154,8 +154,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index b086b0c82e..15c02ff1ca 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -206,7 +206,7 @@ org.apache.maven.surefire surefire-testng - ${surefire.version} + ${maven-surefire-plugin.version} diff --git a/msa/edqs/pom.xml b/msa/edqs/pom.xml index 27d1924c68..798389ce3a 100644 --- a/msa/edqs/pom.xml +++ b/msa/edqs/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../.. + ${maven.multiModuleProjectDirectory} tb-edqs tb-edqs /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard edqs ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-edqs - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard - edqs - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/edqs/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/edqs/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-edqs + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/edqs/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml index d6be224e3c..efa4b3be64 100644 --- a/msa/js-executor/pom.xml +++ b/msa/js-executor/pom.xml @@ -37,7 +37,7 @@ tb-js-executor tb-js-executor js - false + false process-resources package ${project.build.directory}/package/linux diff --git a/msa/monitoring/pom.xml b/msa/monitoring/pom.xml index ad82578ccf..31f08b37c4 100644 --- a/msa/monitoring/pom.xml +++ b/msa/monitoring/pom.xml @@ -34,7 +34,7 @@ UTF-8 - ${basedir}/../.. + ${maven.multiModuleProjectDirectory} tb-monitoring tb-monitoring /var/log/${pkg.name} @@ -47,8 +47,6 @@ org.thingsboard monitoring ${project.version} - deb - deb provided @@ -57,25 +55,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-monitoring-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard - monitoring - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/monitoring/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/monitoring/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -100,6 +94,26 @@ + + copy-tb-monitoring-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/monitoring/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/pom.xml b/msa/pom.xml index 7e5eb5619c..4921888c5c 100644 --- a/msa/pom.xml +++ b/msa/pom.xml @@ -31,6 +31,10 @@ ${basedir}/.. + + package thingsboard thingsboard/openjdk17:bookworm-slim true @@ -53,6 +57,37 @@ + + + skip-deb + + + pkg.skip.deb + true + + + + none + + + + + skip-pkg + + + pkg.skip + true + + + + none + + black-box-tests diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml index 0813613e3b..7fa0936efe 100644 --- a/msa/tb-node/pom.xml +++ b/msa/tb-node/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../.. + ${maven.multiModuleProjectDirectory} thingsboard tb-node /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard application ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard - application - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/application/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/application/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/application/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml index ae6792af05..afd4bcc1e9 100644 --- a/msa/tb/pom.xml +++ b/msa/tb/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../.. + ${maven.multiModuleProjectDirectory} thingsboard tb-postgres tb-cassandra @@ -45,8 +45,6 @@ org.thingsboard application ${project.version} - deb - deb provided @@ -55,44 +53,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-postgres-deb - package - - copy - - - - - org.thingsboard - application - deb - deb - ${pkg.name}.deb - ${project.build.directory}/docker-postgres - - - - - - copy-tb-cassandra-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard - application - deb - deb - ${pkg.name}.deb - ${project.build.directory}/docker-cassandra - - + + + + ${main.dir}/application/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/application/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -101,7 +76,7 @@ org.apache.maven.plugins maven-resources-plugin - + copy-docker-tb-postgres-config process-resources @@ -141,6 +116,46 @@ + + copy-tb-postgres-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory}/docker-postgres + true + + + ${main.dir}/application/target + + ${pkg.name}.deb + + false + + + + + + copy-tb-cassandra-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory}/docker-cassandra + true + + + ${main.dir}/application/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml index ac3e48f8b8..30ee04d711 100644 --- a/msa/transport/coap/pom.xml +++ b/msa/transport/coap/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../../.. + ${maven.multiModuleProjectDirectory} tb-coap-transport tb-coap-transport /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard.transport coap ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-coap-transport-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.transport - coap - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/transport/coap/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/transport/coap/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-coap-transport-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/transport/coap/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml index e4f11f2e47..9602f3bb7e 100644 --- a/msa/transport/http/pom.xml +++ b/msa/transport/http/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../../.. + ${maven.multiModuleProjectDirectory} tb-http-transport tb-http-transport /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard.transport http ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-http-transport-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.transport - http - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/transport/http/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/transport/http/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-http-transport-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/transport/http/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml index b5565bb0c0..19be34cb92 100644 --- a/msa/transport/lwm2m/pom.xml +++ b/msa/transport/lwm2m/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../../.. + ${maven.multiModuleProjectDirectory} tb-lwm2m-transport tb-lwm2m-transport /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard.transport lwm2m ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-lwm2m-transport-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.transport - lwm2m - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/transport/lwm2m/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/transport/lwm2m/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-lwm2m-transport-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/transport/lwm2m/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml index cad028e2b2..437d2eb0a7 100644 --- a/msa/transport/mqtt/pom.xml +++ b/msa/transport/mqtt/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../../.. + ${maven.multiModuleProjectDirectory} tb-mqtt-transport tb-mqtt-transport /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard.transport mqtt ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-mqtt-transport-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.transport - mqtt - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/transport/mqtt/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/transport/mqtt/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-mqtt-transport-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/transport/mqtt/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml index f725f3c2bc..0f0c758889 100644 --- a/msa/transport/snmp/pom.xml +++ b/msa/transport/snmp/pom.xml @@ -34,7 +34,7 @@ UTF-8 - ${basedir}/../../.. + ${maven.multiModuleProjectDirectory} tb-snmp-transport tb-snmp-transport /var/log/${pkg.name} @@ -47,8 +47,6 @@ org.thingsboard.transport snmp ${project.version} - deb - deb provided @@ -57,25 +55,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-snmp-transport-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.transport - snmp - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/transport/snmp/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/transport/snmp/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -100,6 +94,26 @@ + + copy-tb-snmp-transport-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/transport/snmp/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml index 56421a5b22..0fb7db0ada 100644 --- a/msa/vc-executor-docker/pom.xml +++ b/msa/vc-executor-docker/pom.xml @@ -33,7 +33,7 @@ UTF-8 - ${basedir}/../.. + ${maven.multiModuleProjectDirectory} tb-vc-executor tb-vc-executor /var/log/${pkg.name} @@ -46,8 +46,6 @@ org.thingsboard.msa vc-executor ${project.version} - deb - deb provided @@ -56,25 +54,21 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-enforcer-plugin - copy-tb-vc-executor-deb - package - - copy - + enforce-deb-exists + ${pkg.deb.phase} + enforce - - - org.thingsboard.msa - vc-executor - deb - deb - ${pkg.name}.deb - ${project.build.directory} - - + + + + ${main.dir}/msa/vc-executor/target/${pkg.name}.deb + + DEB artifact not found at ${main.dir}/msa/vc-executor/target/${pkg.name}.deb — build the upstream module first or pass -Dpkg.skip.deb=true. + + @@ -99,6 +93,26 @@ + + copy-tb-vc-executor-deb + ${pkg.deb.phase} + + copy-resources + + + ${project.build.directory} + true + + + ${main.dir}/msa/vc-executor/target + + ${pkg.name}.deb + + false + + + + diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml index a48fe8afb5..faa41e9e55 100644 --- a/msa/vc-executor/pom.xml +++ b/msa/vc-executor/pom.xml @@ -35,7 +35,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-vc-executor @@ -115,8 +115,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml index f6b97e2d29..3d638b9c0c 100644 --- a/msa/web-ui/pom.xml +++ b/msa/web-ui/pom.xml @@ -39,7 +39,7 @@ tb-web-ui tb-web-ui js - false + false process-resources package ${project.build.directory}/package/linux diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle index 5ef4576a91..16d3db5131 100644 --- a/packaging/java/build.gradle +++ b/packaging/java/build.gradle @@ -173,3 +173,6 @@ buildDeb { link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") } + +buildDeb.onlyIf { findProperty('skipDeb') != 'true' } +buildRpm.onlyIf { findProperty('skipRpm') != 'true' } diff --git a/packaging/js/build.gradle b/packaging/js/build.gradle index 15b8e546a1..009d1aa460 100644 --- a/packaging/js/build.gradle +++ b/packaging/js/build.gradle @@ -126,3 +126,6 @@ buildDeb { link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") } + +buildDeb.onlyIf { findProperty('skipDeb') != 'true' } +buildRpm.onlyIf { findProperty('skipRpm') != 'true' } diff --git a/pom.xml b/pom.xml index 5347769e1e..50367c23fa 100755 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,33 @@ 17 17 ${basedir} - true none none + + + false + + false + + false + + false + + ${pkg.package.phase} thingsboard ${project.name} /var/log/${pkg.name} @@ -70,6 +94,9 @@ 1.7.1 3.5.4 3.5.0 + 3.5.4 + 3.1.4 + 3.1.4 2.8.8TB 2.2.30 0.8 @@ -179,6 +206,43 @@ + + + skip-deb + + + pkg.skip.deb + true + + + + none + + + + + + skip-pkg + + + pkg.skip + true + + + + true + true + true + true + none + + + packaging @@ -484,7 +548,12 @@ org.springframework.boot spring-boot-maven-plugin - ${pkg.disabled} + + ${pkg.skip.bootjar} ${pkg.mainClass} boot ZIP @@ -528,6 +597,8 @@ -PpkgInstallFolder=${pkg.installFolder} -PpkgCopyInstallScripts=${pkg.copyInstallScripts} -PpkgLogFolder=${pkg.unixLogFolder} + -PskipDeb=${pkg.skip.deb} + -PskipRpm=${pkg.skip.rpm} --project-cache-dir ${project.build.directory}/.gradle --warning-mode @@ -547,6 +618,7 @@ org.apache.maven.plugins maven-assembly-plugin + ${pkg.skip.zip} ${pkg.name} ${main.dir}/packaging/${pkg.type}/assembly/windows.xml @@ -563,23 +635,24 @@ - org.apache.maven.plugins - maven-install-plugin - - ${project.build.directory}/${pkg.name}.deb - ${project.artifactId} - ${project.groupId} - ${project.version} - deb - deb - + org.codehaus.mojo + build-helper-maven-plugin - install-deb - ${pkg.package.phase} + attach-deb + ${pkg.deb.phase} - install-file + attach-artifact + + + + ${project.build.directory}/${pkg.name}.deb + deb + deb + + + @@ -658,7 +731,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} + ${maven-surefire-plugin.version} -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=200 @@ -671,12 +744,17 @@ org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + ${maven-install-plugin.version} org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 org.codehaus.mojo diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml index ab28fbd377..6fa7021197 100644 --- a/transport/coap/pom.xml +++ b/transport/coap/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-coap-transport @@ -109,8 +109,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/transport/http/pom.xml b/transport/http/pom.xml index 3ebc67b9b4..ae08bf63c3 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-http-transport @@ -109,8 +109,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml index ac909a78ee..daa078699d 100644 --- a/transport/lwm2m/pom.xml +++ b/transport/lwm2m/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-lwm2m-transport @@ -163,8 +163,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml index 6ba1ce7ecc..e5eed8cd5a 100644 --- a/transport/mqtt/pom.xml +++ b/transport/mqtt/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-mqtt-transport @@ -109,8 +109,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml index e43be42e4c..370f2ce325 100644 --- a/transport/snmp/pom.xml +++ b/transport/snmp/pom.xml @@ -36,7 +36,7 @@ UTF-8 ${basedir}/../.. java - false + false process-resources package tb-snmp-transport @@ -94,8 +94,8 @@ maven-assembly-plugin - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + build-helper-maven-plugin From ac96b4035b2193296c1133f27d0f39dc3dab0fce Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Wed, 18 Mar 2026 23:41:53 +0100 Subject: [PATCH 2/5] Replace Spotify dockerfile-maven-plugin with exec-maven-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The com.spotify:dockerfile-maven-plugin:1.4.13 is deprecated and broken on modern macOS (Apple Silicon) due to its Java HTTP client being incompatible with current Docker Desktop socket/API. Replace the Java-based plugin with exec-maven-plugin calling the docker CLI directly — the same approach already used by the multiarch push profiles (push-docker-amd-arm-images). All existing Maven property contracts preserved: - dockerfile.skip (default true) controls docker build - push-docker-image profile for single-arch push - push-docker-amd-arm-images profiles unchanged (already use exec) --- msa/edqs/pom.xml | 58 +++++++++-------- msa/js-executor/pom.xml | 58 +++++++++-------- msa/monitoring/pom.xml | 58 +++++++++-------- msa/pom.xml | 15 ++--- msa/tb-node/pom.xml | 58 +++++++++-------- msa/tb/pom.xml | 112 ++++++++++++++++++--------------- msa/transport/coap/pom.xml | 58 +++++++++-------- msa/transport/http/pom.xml | 58 +++++++++-------- msa/transport/lwm2m/pom.xml | 58 +++++++++-------- msa/transport/mqtt/pom.xml | 58 +++++++++-------- msa/transport/snmp/pom.xml | 58 +++++++++-------- msa/vc-executor-docker/pom.xml | 58 +++++++++-------- msa/web-ui/pom.xml | 58 +++++++++-------- 13 files changed, 418 insertions(+), 347 deletions(-) diff --git a/msa/edqs/pom.xml b/msa/edqs/pom.xml index 798389ce3a..3377cff6c6 100644 --- a/msa/edqs/pom.xml +++ b/msa/edqs/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml index efa4b3be64..6f57b5ddd2 100644 --- a/msa/js-executor/pom.xml +++ b/msa/js-executor/pom.xml @@ -146,33 +146,37 @@ maven-assembly-plugin - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -222,29 +226,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/monitoring/pom.xml b/msa/monitoring/pom.xml index 31f08b37c4..aded630179 100644 --- a/msa/monitoring/pom.xml +++ b/msa/monitoring/pom.xml @@ -117,33 +117,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -161,29 +165,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/pom.xml b/msa/pom.xml index 4921888c5c..d56a7aa265 100644 --- a/msa/pom.xml +++ b/msa/pom.xml @@ -39,7 +39,7 @@ thingsboard/openjdk17:bookworm-slim true true - 1.4.13 + 3.5.1 none @@ -248,19 +248,12 @@ - - - com.spotify - dockerfile-maven-extension - ${dockerfile-maven.version} - - - com.spotify - dockerfile-maven-plugin - ${dockerfile-maven.version} + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml index 7fa0936efe..8272815640 100644 --- a/msa/tb-node/pom.xml +++ b/msa/tb-node/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml index afd4bcc1e9..33e7abeabf 100644 --- a/msa/tb/pom.xml +++ b/msa/tb/pom.xml @@ -159,61 +159,69 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-tb-postgres-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${tb-postgres.docker.name} - true - false - ${project.build.directory}/docker-postgres - true + docker + ${project.build.directory}/docker-postgres + + build + --no-cache + -t + ${docker.repo}/${tb-postgres.docker.name}:latest + . + tag-docker-tb-postgres-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${tb-postgres.docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${tb-postgres.docker.name}:latest + ${docker.repo}/${tb-postgres.docker.name}:${project.version} + build-docker-tb-cassandra-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${tb-cassandra.docker.name} - true - false - ${project.build.directory}/docker-cassandra - true + docker + ${project.build.directory}/docker-cassandra + + build + --no-cache + -t + ${docker.repo}/${tb-cassandra.docker.name}:latest + . + tag-docker-tb-cassandra-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${tb-cassandra.docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${tb-cassandra.docker.name}:latest + ${docker.repo}/${tb-cassandra.docker.name}:${project.version} + @@ -231,51 +239,55 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-tb-postgres-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${tb-postgres.docker.name} + docker + + push + ${docker.repo}/${tb-postgres.docker.name}:latest + push-version-docker-tb-postgres-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${tb-postgres.docker.name} + docker + + push + ${docker.repo}/${tb-postgres.docker.name}:${project.version} + push-latest-docker-tb-cassandra-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${tb-cassandra.docker.name} + docker + + push + ${docker.repo}/${tb-cassandra.docker.name}:latest + push-version-docker-tb-cassandra-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${tb-cassandra.docker.name} + docker + + push + ${docker.repo}/${tb-cassandra.docker.name}:${project.version} + diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml index 30ee04d711..6517d8b466 100644 --- a/msa/transport/coap/pom.xml +++ b/msa/transport/coap/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml index 9602f3bb7e..4c3445c4fc 100644 --- a/msa/transport/http/pom.xml +++ b/msa/transport/http/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml index 19be34cb92..e106d81641 100644 --- a/msa/transport/lwm2m/pom.xml +++ b/msa/transport/lwm2m/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml index 437d2eb0a7..f2f4f1e531 100644 --- a/msa/transport/mqtt/pom.xml +++ b/msa/transport/mqtt/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml index 0f0c758889..a1e024c735 100644 --- a/msa/transport/snmp/pom.xml +++ b/msa/transport/snmp/pom.xml @@ -117,33 +117,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -161,29 +165,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml index 0fb7db0ada..5713d9a142 100644 --- a/msa/vc-executor-docker/pom.xml +++ b/msa/vc-executor-docker/pom.xml @@ -116,33 +116,37 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -160,29 +164,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml index 3d638b9c0c..efbdb693c8 100644 --- a/msa/web-ui/pom.xml +++ b/msa/web-ui/pom.xml @@ -193,33 +193,37 @@ maven-assembly-plugin - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin build-docker-image pre-integration-test - - build - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - true - false - ${project.build.directory} + docker + ${project.build.directory} + + build + -t + ${docker.repo}/${docker.name}:latest + . + tag-docker-image pre-integration-test - - tag - + exec ${dockerfile.skip} - ${docker.repo}/${docker.name} - ${project.version} + docker + + tag + ${docker.repo}/${docker.name}:latest + ${docker.repo}/${docker.name}:${project.version} + @@ -269,29 +273,31 @@ - com.spotify - dockerfile-maven-plugin + org.codehaus.mojo + exec-maven-plugin push-latest-docker-image pre-integration-test - - push - + exec - latest - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:latest + push-version-docker-image pre-integration-test - - push - + exec - ${project.version} - ${docker.repo}/${docker.name} + docker + + push + ${docker.repo}/${docker.name}:${project.version} + From d4bc29983346905c3af3e944071f1eab56fbaa2a Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Thu, 19 Mar 2026 00:03:47 +0100 Subject: [PATCH 3/5] Fix black-box-tests docker-info dependency resolution The docker-info artifact type was produced by the removed dockerfile-maven-plugin. Replace with pom type since the upstream docker modules use pom packaging. This preserves the reactor ordering dependency. --- msa/black-box-tests/pom.xml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index 15c02ff1ca..8e4dcdc6c4 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -128,42 +128,50 @@ org.thingsboard.msa js-executor - docker-info + ${project.version} + pom org.thingsboard.msa web-ui - docker-info + ${project.version} + pom org.thingsboard.msa tb-node - docker-info + ${project.version} + pom org.thingsboard.msa.transport coap - docker-info + ${project.version} + pom org.thingsboard.msa.transport http - docker-info + ${project.version} + pom org.thingsboard.msa.transport mqtt - docker-info + ${project.version} + pom org.thingsboard.msa.transport lwm2m - docker-info + ${project.version} + pom org.thingsboard.msa.transport snmp - docker-info + ${project.version} + pom org.thingsboard.common From 7bb708888f5949cebaaeb96942f10d3d22e8f798 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Thu, 26 Mar 2026 11:49:00 +0100 Subject: [PATCH 4/5] Address review: fix pkg.skip.bootjar precedence and remove unused surefire.version Remove false from all child module 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 @@ UTF-8 ${basedir}/.. java - false process-resources package thingsboard 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 @@ UTF-8 ${basedir}/.. java - false process-resources package tb-edqs 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 @@ UTF-8 ${basedir}/.. java - false process-resources package tb-monitoring 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 @@ tb-js-executor tb-js-executor js - false process-resources package ${project.build.directory}/package/linux 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-vc-executor 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 @@ tb-web-ui tb-web-ui js - false process-resources package ${project.build.directory}/package/linux diff --git a/pom.xml b/pom.xml index 50367c23fa..6eec204fe7 100755 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,6 @@ 1.2.5 1.2.5 1.7.1 - 3.5.4 3.5.0 3.5.4 3.1.4 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-coap-transport 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-http-transport 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-lwm2m-transport 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-mqtt-transport 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 @@ UTF-8 ${basedir}/../.. java - false process-resources package tb-snmp-transport From 71233b4ab56f831053a794ac8eb95640ce911422 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Thu, 26 Mar 2026 16:06:14 +0200 Subject: [PATCH 5/5] Update build.sh to skip packaging --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index d2a965f281..0342aa9cbf 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,7 @@ java -version #echo "Cleaning ui-ngx/node_modules" && rm -rf ui-ngx/node_modules MAVEN_OPTS="-Xmx1024m" NODE_OPTIONS="--max_old_space_size=4096" DOCKER_CLI_EXPERIMENTAL=enabled DOCKER_BUILDKIT=0 \ -mvn -T2 license:format clean install -DskipTests \ +mvn -T6 license:format clean install -DskipTests -Dpkg.skip=true \ $PROJECTS --also-make # \ # -Dpush-docker-amd-arm-images