Upgrade to Spring Boot 4.0 snapshots.

See #693

Author: mp911de

bom/pom.xml

@@ -4,13 +4,13 @@
 
 	<groupId>org.springframework.data.examples</groupId>
 	<artifactId>spring-data-examples-bom</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 
 	<name>Spring Data - Using the BOM for dependency management</name>
 
 	<properties>
-		<spring.version>6.0.0</spring.version>
-		<spring-data.version>2022.0.0</spring-data.version>
+		<spring.version>7.0.0-M9</spring.version>
+		<spring-data.version>2025.1.0-M6</spring-data.version>
 	</properties>
 
 	<dependencyManagement>

cassandra/aot-optimization/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-cassandra-examples</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -17,11 +17,6 @@
 		Repositories.
 	</description>
 
-	<properties>
-		<spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
-		<spring-framework.version>7.0.0-M9</spring-framework.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>

cassandra/example/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-cassandra-examples</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

cassandra/example/src/main/java/example/springdata/cassandra/auditing/BasicConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import java.util.Optional;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.config.EnableCassandraAuditing;

cassandra/example/src/main/java/example/springdata/cassandra/basic/BasicConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package example.springdata.cassandra.basic;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Configuration;
 
 /**

cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
 import java.util.List;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;

cassandra/example/src/main/java/example/springdata/cassandra/events/BasicConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package example.springdata.cassandra.events;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

cassandra/example/src/main/java/example/springdata/cassandra/optimisticlocking/BasicConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package example.springdata.cassandra.optimisticlocking;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Configuration;
 
 /**

cassandra/example/src/main/java/example/springdata/cassandra/projection/ProjectionConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package example.springdata.cassandra.projection;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Configuration;
 
 /**

cassandra/example/src/test/java/example/springdata/cassandra/basic/CassandraOperationsIntegrationTests.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,10 +19,8 @@
 
 import example.springdata.cassandra.util.CassandraKeyspace;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,12 +30,10 @@
 import org.springframework.data.cassandra.core.AsyncCassandraTemplate;
 import org.springframework.data.cassandra.core.CassandraOperations;
 import org.springframework.data.cassandra.core.CassandraTemplate;
-import org.springframework.util.concurrent.ListenableFuture;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
-import com.datastax.oss.driver.api.querybuilder.insert.Insert;
 
 /**
  * Integration test showing the basic usage of {@link CassandraTemplate}.
@@ -48,12 +44,11 @@
 @CassandraKeyspace
 class CassandraOperationsIntegrationTests {
 
-
 	@Autowired CqlSession session;
 	@Autowired CassandraOperations template;
 
 	@BeforeEach
-	void setUp() throws Exception {
+	void setUp() {
 		template.getCqlOperations().execute("TRUNCATE users");
 	}
 
@@ -121,7 +116,7 @@ void insertAsynchronously() throws InterruptedException {
 
 		var future = asyncTemplate.insert(user);
 
-		future.whenComplete((it,ex) -> {
+		future.whenComplete((it, ex) -> {
 			var loaded = template.selectOneById(it.getId(), User.class);
 			assertThat(loaded).isEqualTo(it);
 		});