diff --git a/spring-batch-excel/.mvn/jvm.config b/spring-batch-excel/.mvn/jvm.config
deleted file mode 100644
index 8488a4fc..00000000
--- a/spring-batch-excel/.mvn/jvm.config
+++ /dev/null
@@ -1,10 +0,0 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
\ No newline at end of file
diff --git a/spring-batch-excel/pom.xml b/spring-batch-excel/pom.xml
index 71741330..d31dda82 100644
--- a/spring-batch-excel/pom.xml
+++ b/spring-batch-excel/pom.xml
@@ -102,36 +102,26 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>am.ik.maven</groupId>
+				<artifactId>nullability-maven-plugin</artifactId>
+				<version>0.5.2</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<goals>
+							<goal>configure</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<compilerArgs>
-						<compilerArg>-Xlint:all,-varargs</compilerArg>
-						<!-- https://errorprone.info/docs/installation#maven -->
-						<compilerArg>-XDcompilePolicy=simple</compilerArg>
-						<compilerArg>--should-stop=ifError=FLOW</compilerArg>
-						<compilerArg>
-							-Xplugin:ErrorProne
-							-XepDisableAllChecks
-							<!-- Check JSpecify annotations -->
-							-Xep:NullAway
-							-XepOpt:NullAway:OnlyNullMarked
-							-XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
-						</compilerArg>
+						<compilerArg>-Xlint:all</compilerArg>
 					</compilerArgs>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>com.google.errorprone</groupId>
-							<artifactId>error_prone_core</artifactId>
-							<version>2.48.0</version>
-						</path>
-						<path>
-							<groupId>com.uber.nullaway</groupId>
-							<artifactId>nullaway</artifactId>
-							<version>0.13.1</version>
-						</path>
-					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/package-info.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/package-info.java
index 517d6948..6ada1ed9 100644
--- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/package-info.java
+++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/package-info.java
@@ -17,4 +17,7 @@
 /**
  * Default {@code RowMapper} implementations.
  */
+@NullUnmarked
 package org.springframework.batch.extensions.excel.mapping;
+
+import org.jspecify.annotations.NullUnmarked;
diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/package-info.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/package-info.java
index 2fba7ef8..97b6e223 100644
--- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/package-info.java
+++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/package-info.java
@@ -17,4 +17,7 @@
 /**
  * Core interfaces for reading Excel files.
  */
+@NullUnmarked
 package org.springframework.batch.extensions.excel;
+
+import org.jspecify.annotations.NullUnmarked;
diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/package-info.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/package-info.java
index b90bbe55..96dae787 100644
--- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/package-info.java
+++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/package-info.java
@@ -17,4 +17,7 @@
 /**
  * Support classes for the Apache POI library.
  */
+@NullUnmarked
 package org.springframework.batch.extensions.excel.poi;
+
+import org.jspecify.annotations.NullUnmarked;
diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/package-info.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/package-info.java
index fcbad2e7..cf9e2933 100644
--- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/package-info.java
+++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/package-info.java
@@ -17,4 +17,7 @@
 /**
  * Streaming implementation of ItemReaders.
  */
+@NullUnmarked
 package org.springframework.batch.extensions.excel.streaming;
+
+import org.jspecify.annotations.NullUnmarked;
diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/package-info.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/package-info.java
index 07dbb815..67850aab 100644
--- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/package-info.java
+++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/package-info.java
@@ -17,4 +17,7 @@
 /**
  * RowSet abstraction for Excel documents.
  */
+@NullUnmarked
 package org.springframework.batch.extensions.excel.support.rowset;
+
+import org.jspecify.annotations.NullUnmarked;
diff --git a/spring-batch-notion/.mvn/jvm.config b/spring-batch-notion/.mvn/jvm.config
deleted file mode 100644
index 32599cef..00000000
--- a/spring-batch-notion/.mvn/jvm.config
+++ /dev/null
@@ -1,10 +0,0 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
diff --git a/spring-batch-notion/pom.xml b/spring-batch-notion/pom.xml
index 1b80a50d..63059ffb 100644
--- a/spring-batch-notion/pom.xml
+++ b/spring-batch-notion/pom.xml
@@ -73,6 +73,24 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>am.ik.maven</groupId>
+        <artifactId>nullability-maven-plugin</artifactId>
+        <version>0.5.2</version>
+        <extensions>true</extensions>
+        <configuration>
+          <nullAwayOptions>
+            <SuppressionNameAliases>DataFlowIssue</SuppressionNameAliases>
+          </nullAwayOptions>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>configure</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
@@ -130,31 +148,7 @@ limitations under the License.
         <configuration>
           <compilerArgs>
             <compilerArg>-Xlint:all,-varargs</compilerArg>
-            <!-- https://errorprone.info/docs/installation#maven -->
-            <compilerArg>-XDcompilePolicy=simple</compilerArg>
-            <compilerArg>--should-stop=ifError=FLOW</compilerArg>
-            <compilerArg>
-              -Xplugin:ErrorProne
-              -XepDisableAllChecks
-              <!-- Check JSpecify annotations -->
-              -Xep:NullAway
-              -XepOpt:NullAway:OnlyNullMarked
-              -Xep:RequireExplicitNullMarking:WARN
-              -XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
-            </compilerArg>
           </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.46.0</version>
-            </path>
-            <path>
-              <groupId>com.uber.nullaway</groupId>
-              <artifactId>nullaway</artifactId>
-              <version>0.13.1</version>
-            </path>
-          </annotationProcessorPaths>
           <failOnWarning>true</failOnWarning>
         </configuration>
       </plugin>
diff --git a/spring-batch-s3/.mvn/jvm.config b/spring-batch-s3/.mvn/jvm.config
deleted file mode 100644
index 8488a4fc..00000000
--- a/spring-batch-s3/.mvn/jvm.config
+++ /dev/null
@@ -1,10 +0,0 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
\ No newline at end of file
diff --git a/spring-batch-s3/pom.xml b/spring-batch-s3/pom.xml
index 520d6fca..a29e082c 100644
--- a/spring-batch-s3/pom.xml
+++ b/spring-batch-s3/pom.xml
@@ -125,6 +125,19 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>am.ik.maven</groupId>
+        <artifactId>nullability-maven-plugin</artifactId>
+        <version>0.5.2</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>configure</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>io.spring.javaformat</groupId>
         <artifactId>spring-javaformat-maven-plugin</artifactId>
@@ -135,31 +148,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgs>
-            <compilerArg>-Xlint:all,-varargs</compilerArg>
-            <!-- https://errorprone.info/docs/installation#maven -->
-            <compilerArg>-XDcompilePolicy=simple</compilerArg>
-            <compilerArg>--should-stop=ifError=FLOW</compilerArg>
-            <compilerArg>
-              -Xplugin:ErrorProne
-              -XepDisableAllChecks
-              <!-- Check JSpecify annotations -->
-              -Xep:NullAway
-              -XepOpt:NullAway:OnlyNullMarked
-              -XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
-            </compilerArg>
+            <compilerArg>-Xlint:all</compilerArg>
           </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.43.0</version>
-            </path>
-            <path>
-              <groupId>com.uber.nullaway</groupId>
-              <artifactId>nullaway</artifactId>
-              <version>0.12.11</version>
-            </path>
-          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>