From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Wed, 14 Aug 2024 07:39:34 +0000 (+0200)
Subject: Prevent spring dependency management from overriding cassandra driver version in... 
X-Git-Tag: 1.14.6~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=49acf38a32a56065ad084d1d925718072b9740e4;p=aai%2Fgraphadmin.git

Prevent spring dependency management from overriding cassandra driver version in graphadmin

- define dependencyManagement for the cassandra driver [0]

[0] spring-boot has autoconfiguration and dependency management for cassandra.
This management is overriding the newer driver version that is used by janusgraph-cql.
Issue-ID: AAI-3963
Change-Id: I9df5e5c91cf7dd5fd330152699121ca164a53da5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---

diff --git a/pom.xml b/pom.xml
index e626688..075dea5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,11 @@
         <jcommander.version>1.78</jcommander.version>
         <gremlin.version>3.5.8</gremlin.version>
         <janusgraph.version>0.6.4</janusgraph.version>
+
+        <!-- fix the driver version to match the one defined in janusgraph-cql
+            spring-boot (2.4) is otherwise downgrading it to 4.9.0 -->
+        <!-- see https://github.com/JanusGraph/janusgraph/blob/v0.6.0/pom.xml#L120 -->
+        <cassandra-driver.version>4.13.0</cassandra-driver.version>
     </properties>
 
     <profiles>
@@ -322,6 +327,11 @@
                 <artifactId>guava</artifactId>
                 <version>25.0-jre</version>
             </dependency>
+            <dependency>
+                <groupId>com.datastax.oss</groupId>
+                <artifactId>java-driver-core</artifactId>
+                <version>${cassandra-driver.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>