From c945bebab32f9258e22403ec3de85d5a8716a017 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 1 Sep 2021 15:19:56 +0300
Subject: [PATCH] dependency-hotfix-after-merge-ce (httpclient doubled, test
 dependency outdated)

---
 common/cluster-api/pom.xml | 13 +++++++++----
 pom.xml                    |  6 ------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml
index ddb7a6065e..a5b9a00308 100644
--- a/common/cluster-api/pom.xml
+++ b/common/cluster-api/pom.xml
@@ -101,13 +101,18 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index e04a327e26..291e9709ab 100755
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,6 @@
         <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
         <antisamy.version>1.6.2</antisamy.version>
         <snmp4j.version>2.8.5</snmp4j.version>
-        <httpclient.version>4.5.13</httpclient.version>
         <!--         TEST SCOPE         -->
         <awaitility.version>4.1.0</awaitility.version>
         <cassandra-unit.version>4.3.1.0</cassandra-unit.version>
@@ -1848,11 +1847,6 @@
                 <version>${zeroturnaround.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>