Skip to content

Commit 45cb35b

Browse files
committed
Migrate to Cassandra driver at org.apache.cassandra.
Closes #1467
1 parent 9b930ed commit 45cb35b

File tree

5 files changed

+58
-6
lines changed

5 files changed

+58
-6
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
9191
<build.cassandra.storage_port>17000</build.cassandra.storage_port>
9292
<cassandra.version>3.11.12</cassandra.version>
93-
<cassandra-driver.version>4.17.0</cassandra-driver.version>
93+
<cassandra-driver.version>4.18.0</cassandra-driver.version>
9494
<dist.id>spring-data-cassandra</dist.id>
9595
<el.version>1.0</el.version>
9696
<!-- NOTE: com.carrotsearch:hppc dependency version set to same version as Apache Cassandra 3.11.5 -->
@@ -105,7 +105,7 @@
105105

106106
<!-- Cassandra Driver -->
107107
<dependency>
108-
<groupId>com.datastax.oss</groupId>
108+
<groupId>org.apache.cassandra</groupId>
109109
<artifactId>java-driver-bom</artifactId>
110110
<version>${cassandra-driver.version}</version>
111111
<scope>import</scope>

spring-data-cassandra/pom.xml

+9-2
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262

6363
<!-- Cassandra driver -->
6464
<dependency>
65-
<groupId>com.datastax.oss</groupId>
65+
<groupId>org.apache.cassandra</groupId>
6666
<artifactId>java-driver-core</artifactId>
6767
</dependency>
6868

6969
<dependency>
70-
<groupId>com.datastax.oss</groupId>
70+
<groupId>org.apache.cassandra</groupId>
7171
<artifactId>java-driver-query-builder</artifactId>
7272
</dependency>
7373

@@ -128,6 +128,13 @@
128128
<optional>true</optional>
129129
</dependency>
130130

131+
<dependency>
132+
<groupId>com.google.code.findbugs</groupId>
133+
<artifactId>jsr305</artifactId>
134+
<version>3.0.2</version>
135+
<optional>true</optional>
136+
</dependency>
137+
131138
<!-- CDI -->
132139

133140
<dependency>

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.data.convert.CustomConversions;
3333
import org.springframework.data.mapping.MappingException;
3434
import org.springframework.data.mapping.context.MappingContext;
35+
import org.springframework.lang.NonNull;
3536
import org.springframework.lang.Nullable;
3637
import org.springframework.util.Assert;
3738

@@ -378,7 +379,7 @@ public UdtValue newValue() {
378379
}
379380

380381
@Override
381-
public UdtValue newValue(@edu.umd.cs.findbugs.annotations.NonNull Object... fields) {
382+
public UdtValue newValue(@NonNull Object... fields) {
382383
throw new UnsupportedOperationException(
383384
"This implementation should only be used internally, this is likely a driver bug");
384385
}
@@ -396,7 +397,7 @@ public boolean isDetached() {
396397
}
397398

398399
@Override
399-
public void attach(@edu.umd.cs.findbugs.annotations.NonNull AttachmentPoint attachmentPoint) {
400+
public void attach(@NonNull AttachmentPoint attachmentPoint) {
400401
throw new UnsupportedOperationException(
401402
"This implementation should only be used internally, this is likely a driver bug");
402403
}

src/main/antora/modules/ROOT/nav.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*** xref:migration-guide/migration-guide-1.5-to-2.0.adoc[]
55
*** xref:migration-guide/migration-guide-2.2-to-3.0.adoc[]
66
*** xref:migration-guide/migration-guide-3.0-to-4.0.adoc[]
7+
*** xref:migration-guide/migration-guide-4.0-to-4.3.adoc[]
78
89
* xref:cassandra.adoc[]
910
** xref:cassandra/getting-started.adoc[]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
[[cassandra.migration.4.x-to-4.3]]
2+
= Migration Guide from 4.x to 4.3
3+
4+
Spring Data for Apache Cassandra 4.3 has migrated the `com.datastax.oss` groupId to `org.apache.cassandra`.
5+
6+
[[driver-group-id]]
7+
== Migration of the Datastax driver into Apache
8+
9+
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:
10+
11+
.`pom.xml` Example up to 4.2.x
12+
====
13+
[source,xml]
14+
----
15+
<dependency>
16+
<groupId>com.datastax.oss</groupId>
17+
<artifactId>java-driver-core</artifactId>
18+
</dependency>
19+
20+
<dependency>
21+
<groupId>com.datastax.oss</groupId>
22+
<artifactId>java-driver-query-builder</artifactId>
23+
</dependency>
24+
----
25+
====
26+
27+
With upgrading the groupId from `com.datastax.oss` to `org.apache.cassandra` your project configuration would look like:
28+
29+
.`pom.xml` Example since to 4.3.x
30+
====
31+
[source,xml]
32+
----
33+
<dependency>
34+
<groupId>org.apache.cassandra</groupId>
35+
<artifactId>java-driver-core</artifactId>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.cassandra</groupId>
40+
<artifactId>java-driver-query-builder</artifactId>
41+
</dependency>
42+
----
43+
====

0 commit comments

Comments
 (0)