diff --git a/lombok.config b/lombok.config
index d17e623d..26362021 100644
--- a/lombok.config
+++ b/lombok.config
@@ -2,3 +2,4 @@ lombok.anyConstructor.suppressConstructorProperties=true
 lombok.nonNull.exceptionType = IllegalArgumentException
 lombok.log.fieldName = LOG
 lombok.addLombokGeneratedAnnotation = true
+lombok.addNullAnnotations = spring
diff --git a/pom.xml b/pom.xml
index c846ec7c..09f482e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>2.2.0.BUILD-SNAPSHOT</version>
+					<version>2.3.0.BUILD-SNAPSHOT</version>
 					<type>zip</type>
 					<optional>true</optional>
 				</dependency>
@@ -244,7 +244,7 @@
 					<plugin>
 						<groupId>org.projectlombok</groupId>
 						<artifactId>lombok-maven-plugin</artifactId>
-						<version>1.18.4.0</version>
+						<version>1.18.10.0</version>
 						<executions>
 							<execution>
 								<phase>generate-sources</phase>
@@ -814,7 +814,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.4</version>
+			<version>1.18.12</version>
 			<scope>provided</scope>
 		</dependency>