diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java
index bc2712c2f..84b303fe7 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java
@@ -22,7 +22,7 @@ import static org.assertj.core.api.SoftAssertions.*;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.HashMap;
 import java.util.List;
@@ -436,7 +436,7 @@ public class AggregateChangeIdGenerationImmutableUnitTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	@AllArgsConstructor
 	private static class DummyEntity {
 
@@ -461,7 +461,7 @@ public class AggregateChangeIdGenerationImmutableUnitTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	@AllArgsConstructor
 	private static class Content {
 
@@ -482,7 +482,7 @@ public class AggregateChangeIdGenerationImmutableUnitTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	@AllArgsConstructor
 	private static class ContentNoId {
 
@@ -501,7 +501,7 @@ public class AggregateChangeIdGenerationImmutableUnitTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	@AllArgsConstructor
 	private static class Tag {
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
index df7a72bb4..9de697734 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
@@ -19,7 +19,7 @@ import static java.util.Collections.*;
 import static org.assertj.core.api.Assertions.*;
 
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import org.assertj.core.api.SoftAssertions;
 import org.junit.ClassRule;
@@ -270,7 +270,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	static class LegoSet {
 
 		@Id Long id;
@@ -280,7 +280,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	static class Manual {
 
 		@Id Long id;
@@ -288,7 +288,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	static class Author {
 
 		@Id Long id;
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java
index c4bd79909..fd5208c38 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java
@@ -28,7 +28,7 @@ import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -457,7 +457,7 @@ public class EntityRowMapperUnitTests {
 
 	// Model classes to be used in tests
 
-	@Wither
+	@With
 	@RequiredArgsConstructor
 	static class TrivialImmutable {
 
@@ -486,7 +486,7 @@ public class EntityRowMapperUnitTests {
 		AggregateReference<Trivial, Long> trivialId;
 	}
 
-	@Wither
+	@With
 	@RequiredArgsConstructor
 	static class WithReferenceImmutable {
 
@@ -502,7 +502,7 @@ public class EntityRowMapperUnitTests {
 		Trivial child;
 	}
 
-	@Wither
+	@With
 	@RequiredArgsConstructor
 	static class OneToOneImmutable {
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java
index a9f2e92a6..8e74c4b5b 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jdbc.mybatis;
 
-import lombok.experimental.Wither;
+import lombok.With;
 
 import org.apache.ibatis.type.Alias;
 import org.springframework.data.annotation.Id;
@@ -26,7 +26,7 @@ import org.springframework.data.annotation.Id;
 @Alias("DummyEntity")
 class DummyEntity {
 
-	@Wither @Id final Long id;
+	@With @Id final Long id;
 	final String name;
 
 	public DummyEntity(Long id, String name) {
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java
index 028fcfd4e..47a8e1c85 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java
@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*;
 import lombok.Data;
 
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -95,7 +95,7 @@ public class JdbcRepositoryEmbeddedImmutableIntegrationTests {
 	interface DummyEntityRepository extends CrudRepository<DummyEntity, Long> {}
 
 	@Value
-	@Wither
+	@With
 	static class DummyEntity {
 
 		@Id Long id;
@@ -104,7 +104,7 @@ public class JdbcRepositoryEmbeddedImmutableIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	private static class Embeddable {
 
 		Long attr1;
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
index dc31a6a3a..7b3d2a240 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*;
 import lombok.Data;
 import lombok.Value;
 import lombok.experimental.FieldDefaults;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -137,7 +137,7 @@ public class JdbcRepositoryIdGenerationIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	static class ImmutableWithManualIdEntity {
 		@Id Long id;
 		String name;
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
index c565c8a6b..83c107ad0 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.*;
 import junit.framework.AssertionFailedError;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -235,7 +235,7 @@ public class SimpleJdbcRepositoryEventsUnitTests {
 	interface DummyEntityRepository extends CrudRepository<DummyEntity, Long> {}
 
 	@Value
-	@Wither
+	@With
 	@RequiredArgsConstructor
 	static class DummyEntity {
 		@Id Long id;