From 45cb35b4d21dbb114999d2cd9dcd9e3ea5ba234c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Thu, 11 Jan 2024 08:43:50 +0100
Subject: [PATCH] Migrate to Cassandra driver at org.apache.cassandra.

Closes #1467
---
 pom.xml                                       |  4 +-
 spring-data-cassandra/pom.xml                 | 11 ++++-
 .../cassandra/core/convert/SchemaFactory.java |  5 ++-
 src/main/antora/modules/ROOT/nav.adoc         |  1 +
 .../migration-guide-4.0-to-4.3.adoc           | 43 +++++++++++++++++++
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-4.0-to-4.3.adoc

diff --git a/pom.xml b/pom.xml
index cd7d32b37..0d3b2d45a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
 		<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
 		<build.cassandra.storage_port>17000</build.cassandra.storage_port>
 		<cassandra.version>3.11.12</cassandra.version>
-		<cassandra-driver.version>4.17.0</cassandra-driver.version>
+		<cassandra-driver.version>4.18.0</cassandra-driver.version>
 		<dist.id>spring-data-cassandra</dist.id>
 		<el.version>1.0</el.version>
 		<!-- NOTE: com.carrotsearch:hppc dependency version set to same version as Apache Cassandra 3.11.5 -->
@@ -105,7 +105,7 @@
 
 			<!-- Cassandra Driver -->
 			<dependency>
-				<groupId>com.datastax.oss</groupId>
+				<groupId>org.apache.cassandra</groupId>
 				<artifactId>java-driver-bom</artifactId>
 				<version>${cassandra-driver.version}</version>
 				<scope>import</scope>
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index ec2c498c2..f0f45a269 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -62,12 +62,12 @@
 
 		<!-- Cassandra driver -->
 		<dependency>
-			<groupId>com.datastax.oss</groupId>
+			<groupId>org.apache.cassandra</groupId>
 			<artifactId>java-driver-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>com.datastax.oss</groupId>
+			<groupId>org.apache.cassandra</groupId>
 			<artifactId>java-driver-query-builder</artifactId>
 		</dependency>
 
@@ -128,6 +128,13 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<version>3.0.2</version>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- CDI -->
 
 		<dependency>
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java
index e09143a64..9215c7585 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java
@@ -32,6 +32,7 @@
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -378,7 +379,7 @@ public UdtValue newValue() {
 		}
 
 		@Override
-		public UdtValue newValue(@edu.umd.cs.findbugs.annotations.NonNull Object... fields) {
+		public UdtValue newValue(@NonNull Object... fields) {
 			throw new UnsupportedOperationException(
 					"This implementation should only be used internally, this is likely a driver bug");
 		}
@@ -396,7 +397,7 @@ public boolean isDetached() {
 		}
 
 		@Override
-		public void attach(@edu.umd.cs.findbugs.annotations.NonNull AttachmentPoint attachmentPoint) {
+		public void attach(@NonNull AttachmentPoint attachmentPoint) {
 			throw new UnsupportedOperationException(
 					"This implementation should only be used internally, this is likely a driver bug");
 		}
diff --git a/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc
index e3cd86e93..3f30339ae 100644
--- a/src/main/antora/modules/ROOT/nav.adoc
+++ b/src/main/antora/modules/ROOT/nav.adoc
@@ -4,6 +4,7 @@
 *** xref:migration-guide/migration-guide-1.5-to-2.0.adoc[]
 *** xref:migration-guide/migration-guide-2.2-to-3.0.adoc[]
 *** xref:migration-guide/migration-guide-3.0-to-4.0.adoc[]
+*** xref:migration-guide/migration-guide-4.0-to-4.3.adoc[]
 
 * xref:cassandra.adoc[]
 ** xref:cassandra/getting-started.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-4.0-to-4.3.adoc b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-4.0-to-4.3.adoc
new file mode 100644
index 000000000..56fb562c5
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-4.0-to-4.3.adoc
@@ -0,0 +1,43 @@
+[[cassandra.migration.4.x-to-4.3]]
+= Migration Guide from 4.x to 4.3
+
+Spring Data for Apache Cassandra 4.3 has migrated the `com.datastax.oss` groupId to `org.apache.cassandra`.
+
+[[driver-group-id]]
+== Migration of the Datastax driver into Apache
+
+With the migration of the Datastax driver into the Apache foundation, you need to update coordinates of the driver in your code. Consider the following example showing a potential previous state of a Maven project configuration:
+
+.`pom.xml` Example up to 4.2.x
+====
+[source,xml]
+----
+<dependency>
+	<groupId>com.datastax.oss</groupId>
+	<artifactId>java-driver-core</artifactId>
+</dependency>
+
+<dependency>
+	<groupId>com.datastax.oss</groupId>
+	<artifactId>java-driver-query-builder</artifactId>
+</dependency>
+----
+====
+
+With upgrading the groupId from `com.datastax.oss` to `org.apache.cassandra` your project configuration would look like:
+
+.`pom.xml` Example since to 4.3.x
+====
+[source,xml]
+----
+<dependency>
+	<groupId>org.apache.cassandra</groupId>
+	<artifactId>java-driver-core</artifactId>
+</dependency>
+
+<dependency>
+	<groupId>org.apache.cassandra</groupId>
+	<artifactId>java-driver-query-builder</artifactId>
+</dependency>
+----
+====