From 3cc65161a57ee4a1c421c0c573122062063b4eaa Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 14 Sep 2026 16:32:26 +0100
Subject: [PATCH] Remove guava override as web-commons-bom no longer conflicts

---
 pathdb/datastax/pom.xml | 10 +---------
 storage/pom.xml         | 11 +----------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/pathdb/datastax/pom.xml b/pathdb/datastax/pom.xml
index f52cb3e..a3b7f72 100644
--- a/pathdb/datastax/pom.xml
+++ b/pathdb/datastax/pom.xml
@@ -55,14 +55,6 @@
             <artifactId>cassandra-driver-mapping</artifactId>
             <version>${cassandraVersion}</version>
         </dependency>
-        <!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
-            conflicts with cassandra-unit which requires 21 or less. Also CassandraPathDB
-            uses code that has been deprecated in later versions of guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-        </dependency>
         <dependency>
             <groupId>org.cassandraunit</groupId>
             <artifactId>cassandra-unit</artifactId>
@@ -70,4 +62,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/storage/pom.xml b/storage/pom.xml
index 7f12278..5baa174 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -77,14 +77,6 @@
             <artifactId>path-mapped-pathdb-jpa</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
-            conflicts with cassandra-unit which requires 21 or less -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.cassandraunit</groupId>
             <artifactId>cassandra-unit</artifactId>
@@ -121,5 +113,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-</project>
\ No newline at end of file
+</project>