From 20443a725692ae2e5642e37252e01f63c8502e95 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 30 May 2023 23:00:23 +0300
Subject: [PATCH 1/3] upgraded version for azure-servicebus sdk

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a8c06268fd..34f8f77de1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <aws.sdk.version>1.11.747</aws.sdk.version>
         <pubsub.client.version>1.105.0</pubsub.client.version>
         <google.common.protos.version>2.1.0</google.common.protos.version> <!-- required by io.grpc:grpc-protobuf:1.38.0-->
-        <azure-servicebus.version>3.2.0</azure-servicebus.version>
+        <azure-servicebus.version>3.6.7</azure-servicebus.version>
         <passay.version>1.5.0</passay.version>
         <ua-parser.version>1.5.4</ua-parser.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>

From dadde5535e5fc6435db31390bded606618ea92fe Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 1 Jun 2023 19:17:23 +0300
Subject: [PATCH 2/3] added dependencies to avoid conflicts

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 34f8f77de1..3eead59f65 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1335,6 +1335,16 @@
                 <version>${netty.version}</version>
                 <classifier>osx-x86_64</classifier>
             </dependency>
+            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
+                <groupId>com.nimbusds</groupId>
+                <artifactId>content-type</artifactId>
+                <version>2.2</version>
+            </dependency>
+            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>8.0.1</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport-native-unix-common</artifactId>

From 34c8909adf41aac0b90520ea41eb8d6c1905a370 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Fri, 2 Jun 2023 13:05:08 +0300
Subject: [PATCH 3/3] moved servicebus conflicting dependency to exclusions

---
 pom.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3eead59f65..f4c4970d7f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1335,16 +1335,6 @@
                 <version>${netty.version}</version>
                 <classifier>osx-x86_64</classifier>
             </dependency>
-            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
-                <groupId>com.nimbusds</groupId>
-                <artifactId>content-type</artifactId>
-                <version>2.2</version>
-            </dependency>
-            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>8.0.1</version>
-            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport-native-unix-common</artifactId>
@@ -1846,6 +1836,16 @@
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-servicebus</artifactId>
                 <version>${azure-servicebus.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.nimbusds</groupId>
+                        <artifactId>content-type</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.passay</groupId>