Polishing.

Revise test dependencies.

See #1154

Author: mp911de

pom.xml

@@ -206,6 +206,19 @@
 			</plugin>
 		</plugins>
 
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<configuration>
+						<propertiesEncoding>${project.build.sourceEncoding}
+						</propertiesEncoding>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>

spring-data-cassandra/pom.xml

@@ -118,6 +118,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>net.javacrumbs.json-unit</groupId>
+			<artifactId>json-unit-assertj</artifactId>
+			<version>4.1.0</version>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- Reactor -->
 		<dependency>
 			<groupId>io.projectreactor</groupId>
@@ -138,13 +145,6 @@
 			<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>
@@ -168,25 +168,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>net.javacrumbs.json-unit</groupId>
-			<artifactId>json-unit-assertj</artifactId>
-			<version>4.1.0</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>edu.umd.cs.mtc</groupId>
 			<artifactId>multithreadedtc</artifactId>

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Embedded.java

@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.annotation.meta.When;
+import org.jspecify.annotations.NonNull;
 
 import org.springframework.core.annotation.AliasFor;
 
@@ -72,7 +72,8 @@ enum OnEmpty {
 	 * as alternative to the more verbose
 	 *
 	 * <pre class="code">
-	 * &#64;Embedded(onEmpty = USE_NULL) &#64;javax.annotation.Nonnull(when = When.MAYBE) private Address address;
+	 * &#64;Embedded(onEmpty = USE_NULL)
+	 * &#64;Nullable private Address address;
 	 * </pre>
 	 *
 	 * @author Christoph Strobl
@@ -82,7 +83,7 @@ enum OnEmpty {
 	@Documented
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({ ElementType.FIELD, ElementType.METHOD })
-	@javax.annotation.Nonnull(when = When.MAYBE)
+	@org.jspecify.annotations.Nullable
 	@interface Nullable {
 
 		/**
@@ -118,7 +119,7 @@ enum OnEmpty {
 	@Documented
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({ ElementType.FIELD, ElementType.METHOD })
-	@javax.annotation.Nonnull(when = When.NEVER)
+	@NonNull
 	@interface Empty {
 
 		/**

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java

@@ -19,6 +19,10 @@
 import static org.springframework.data.cassandra.core.mapping.BasicMapId.*;
 import static org.springframework.data.cassandra.test.util.RowMockUtil.*;
 
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -33,9 +37,6 @@
 import java.util.*;
 
 import org.assertj.core.data.Percentage;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;