From 04ccf48419763553e57c371f2f38e161be98f865 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 11 Mar 2026 16:02:04 +0100
Subject: [PATCH 1/3] Fix maven-jar-plugin version mismatch across modules

Root pluginManagement and netty-mqtt hardcoded version 3.1.1 while
the jar-plugin.version property (used by dao and others) was set to
3.4.0, causing build failures due to incompatible commons-io dependency.

Replace both hardcoded 3.1.1 occurrences with ${jar-plugin.version}
so all modules consistently use the version defined in one place.

Fixes #15037

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 netty-mqtt/pom.xml | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index c418e91137..2979ae0dda 100644
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@@ -125,7 +125,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>${jar-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifest>
diff --git a/pom.xml b/pom.xml
index 3021b5414a..4322fe6e52 100755
--- a/pom.xml
+++ b/pom.xml
@@ -635,7 +635,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>${jar-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 9208861529380ae9ce5808929ea9b6bfd3131860 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 11 Mar 2026 16:03:12 +0100
Subject: [PATCH 2/3] Bump maven-jar-plugin from 3.4.0 to 3.5.0

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4322fe6e52..bc83721914 100755
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <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.4.0</jar-plugin.version>
+        <jar-plugin.version>3.5.0</jar-plugin.version>
         <springdoc-swagger.version>2.8.8TB</springdoc-swagger.version>
         <swagger-annotations.version>2.2.30</swagger-annotations.version>
         <spatial4j.version>0.8</spatial4j.version>

From b0efe276eb1fc12a3ac764399a4c65c192dec735 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 11 Mar 2026 17:48:51 +0100
Subject: [PATCH 3/3] Refactor dao and netty-mqtt to inherit maven-jar-plugin
 version from pluginManagement

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 dao/pom.xml        | 1 -
 netty-mqtt/pom.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dao/pom.xml b/dao/pom.xml
index 2db0745d45..6e67ea5d27 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -280,7 +280,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${jar-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index 2979ae0dda..615a0ed728 100644
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@@ -125,7 +125,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${jar-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifest>