From 9d0a74c30ea58abd72ca8e5cdb484e30623f03fb Mon Sep 17 00:00:00 2001
From: Maciej Sokol <maciej.sokol@ericsson.com>
Date: Thu, 27 Jul 2023 10:09:11 +0200
Subject: [PATCH] Bump java driver from 4.14.1 to 4.17.0

Netty was stepped as well to make sure we follow the same version as
driver.
---
 CHANGES.md                                 |  1 +
 karaf-feature/pom.xml                      |  5 +++++
 karaf-feature/src/main/feature/feature.xml |  1 +
 pom.xml                                    | 10 ++++++++--
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6fb0ba7f2..8065f9ac4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Version 5.0.0
 
+* Bump java driver from 4.14.1 to 4.17.0
 * Bump guava from 31.1 to 32.0.1 (CVE-2023-2976)
 * Fix shebang in ecctool - Issue #504
 * Bump springboot from 2.7.5 to 2.7.12 - Issue #500
diff --git a/karaf-feature/pom.xml b/karaf-feature/pom.xml
index 78fda3da9..88bf492fe 100644
--- a/karaf-feature/pom.xml
+++ b/karaf-feature/pom.xml
@@ -73,6 +73,11 @@
             <artifactId>netty-transport</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-unix-common</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-resolver</artifactId>
diff --git a/karaf-feature/src/main/feature/feature.xml b/karaf-feature/src/main/feature/feature.xml
index 0b76584cb..a5c51b58e 100644
--- a/karaf-feature/src/main/feature/feature.xml
+++ b/karaf-feature/src/main/feature/feature.xml
@@ -9,6 +9,7 @@
         <bundle>mvn:com.ericsson.bss.cassandra.ecchronos/core.osgi/${project.version}</bundle>
         <bundle>mvn:io.netty/netty-common/${io.netty.version}</bundle>
         <bundle>mvn:io.netty/netty-transport/${io.netty.version}</bundle>
+        <bundle>mvn:io.netty/netty-transport-native-unix-common/${io.netty.version}</bundle>
         <bundle>mvn:io.netty/netty-buffer/${io.netty.version}</bundle>
         <bundle>mvn:io.netty/netty-handler/${io.netty.version}</bundle>
         <bundle>mvn:io.netty/netty-codec/${io.netty.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 6d7d3674b..0d3af428e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,10 @@
         <bundle.namespace>${project.groupId}.${project.artifactId}</bundle.namespace>
 
         <!-- Dependency versions -->
-        <io.netty.version>4.1.69.Final</io.netty.version>
+        <io.netty.version>4.1.94.Final</io.netty.version>
         <io.micrometer.version>1.9.2</io.micrometer.version>
         <io.dropwizard.metrics.version>4.2.10</io.dropwizard.metrics.version>
-        <cassandra.driver.core.version>4.14.1</cassandra.driver.core.version>
+        <cassandra.driver.core.version>4.17.0</cassandra.driver.core.version>
         <guava.version>32.0.1-jre</guava.version>
         <failureaccess.version>1.0.1</failureaccess.version>
         <cassandra.driver.protocol.version>1.5.0</cassandra.driver.protocol.version>
@@ -149,6 +149,12 @@
                 <version>${io.netty.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-unix-common</artifactId>
+                <version>${io.netty.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-resolver</artifactId>