From 08b226c18f3dc0c9c5559f437d463e6894b2b2e6 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 1 Nov 2022 16:56:47 +0200
Subject: [PATCH] Bump Cassandra versions

---
 .../queue/discovery/HashPartitionServiceTest.java |  3 +--
 pom.xml                                           | 15 +++++----------
 .../profile/TbDeviceProfileNodeConfiguration.java |  2 +-
 tools/pom.xml                                     |  4 ----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
index 88aa45c74c..c3e7e6dcef 100644
--- a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.queue.discovery;
 
-import com.datastax.driver.core.utils.UUIDs;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -136,7 +135,7 @@ public class HashPartitionServiceTest {
         Random random = new Random();
         long ts = new SimpleDateFormat("dd-MM-yyyy").parse("06-12-2016").getTime() - TimeUnit.DAYS.toMillis(tenantCount);
         for (int tenantIndex = 0; tenantIndex < tenantCount; tenantIndex++) {
-            TenantId tenantId = new TenantId(UUIDs.startOf(ts));
+            TenantId tenantId = new TenantId(Uuids.startOf(ts));
             ts += TimeUnit.DAYS.toMillis(1) + random.nextInt(1000);
             for (int queueIndex = 0; queueIndex < queueCount; queueIndex++) {
                 QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, "queue" + queueIndex, tenantId);
diff --git a/pom.xml b/pom.xml
index 01a17ece92..4896139822 100755
--- a/pom.xml
+++ b/pom.xml
@@ -51,10 +51,9 @@
         <log4j.version>2.17.1</log4j.version>
         <logback.version>1.2.10</logback.version>
         <rat.version>0.10</rat.version>
-        <cassandra.version>4.10.0</cassandra.version>
+        <cassandra.version>4.15.0</cassandra.version>
         <metrics.version>4.0.5</metrics.version>
-        <cassandra-all.version>3.11.10</cassandra-all.version>
-        <cassandra-driver-core.version>3.11.0</cassandra-driver-core.version>
+        <cassandra-all.version>3.11.14</cassandra-all.version>
         <guava.version>30.0-jre</guava.version>
         <caffeine.version>2.6.1</caffeine.version>
         <commons-lang3.version>3.4</commons-lang3.version>
@@ -65,7 +64,8 @@
         <apache-httpclient.version>4.5.13</apache-httpclient.version>
         <apache-httpcore.version>4.4.14</apache-httpcore.version>
         <joda-time.version>2.8.1</joda-time.version>
-        <jackson.version>2.13.2</jackson.version>
+        <jackson.version>2.13.4</jackson.version>
+        <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
         <californium.version>3.0.0</californium.version>
@@ -1329,11 +1329,6 @@
                 <artifactId>java-driver-query-builder</artifactId>
                 <version>${cassandra.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.datastax.cassandra</groupId>
-                <artifactId>cassandra-driver-core</artifactId>
-                <version>${cassandra-driver-core.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-jmx</artifactId>
@@ -1382,7 +1377,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson.version}</version>
+                <version>${jackson-databind.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeConfiguration.java
index c0da32de9f..9f0e67de48 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeConfiguration.java
@@ -16,7 +16,7 @@
 package org.thingsboard.rule.engine.profile;
 
 import lombok.Data;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 
 @Data
diff --git a/tools/pom.xml b/tools/pom.xml
index 850485ed42..6153698cd1 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -55,10 +55,6 @@
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>