Upgrade NullAway version to 0.12.11

This now requires a JDK 22+ [1] so this commit also
updates the CI and build instructions accordingly.

[1]: https://github.com/uber/NullAway/wiki/JSpecify-Support#supported-jdk-versions

Author: fmbenhassine

.github/workflows/artifactory-staging.yml

@@ -15,10 +15,10 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4.2.2
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/continuous-integration.yml

@@ -10,10 +10,10 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4.2.2
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/documentation-upload.yml

@@ -18,10 +18,10 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/release-notes-generation.yml

@@ -23,11 +23,12 @@ jobs:
       - name: Download changelog generator
         run: wget https://github.com/spring-io/github-changelog-generator/releases/download/v$GENERATOR_VERSION/github-changelog-generator.jar
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
+          cache: 'maven'
 
       - name: Prepare configuration file
         run: |

README.md

@@ -163,14 +163,13 @@ Please see our [Security policy](https://github.com/spring-projects/spring-batch
 
 # Building from Source
 
-## Using the Command Line
-
 Clone the git repository using the URL on the Github home page:
 
     $ git clone git@github.com:spring-projects/spring-batch.git
     $ cd spring-batch
 
-Maven is the build tool used for Spring Batch. You can build the project with the following command:
+To build Spring Batch, you need a JDK 22+. Maven is the build tool used for Spring Batch.
+You can build the project with the following command:
 
     $ ./mvnw package
 
@@ -189,27 +188,6 @@ $ ../mvnw antora:antora
 
 The reference documentation can be found in `spring-batch-docs/target/anotra/site`.
 
-## Using Docker
-
-If you want to build the project in a Docker container, you can proceed as follows:
-
-```
-$> docker run -it --mount type=bind,source="$(pwd)",target=/spring-batch maven:3-openjdk-17 bash
-#> cd spring-batch
-#> ./mvnw package
-```
-
-This will mount the source code that you cloned previously on the host inside the container.
-If you want to work on a copy of the source code inside the container (no side effects on the host),
-you can proceed as follows:
-
-```
-$> docker run -it maven:3-openjdk-17 bash
-#> git clone https://github.com/spring-projects/spring-batch.git
-#> cd spring-batch
-#> ./mvnw package
-```
-
 # Contributing to Spring Batch
 
 We welcome contributions in any kind! Here are some ways for you to contribute to the project:

pom.xml

@@ -146,7 +146,7 @@
 		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
 		<spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
 		<error-prone.version>2.42.0</error-prone.version>
-		<nullaway.version>0.12.10</nullaway.version>
+		<nullaway.version>0.12.11</nullaway.version>
 	</properties>
 
 	<build>
@@ -182,8 +182,6 @@
 							-Xep:NullAway:ERROR
                             -XepOpt:NullAway:JSpecifyMode=true
                             -XepOpt:NullAway:OnlyNullMarked
-							<!-- FIXME Remove once https://github.com/uber/NullAway/pull/1295 is released -->
-							-XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract
 							-XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
 							<!-- https://github.com/uber/NullAway/issues/162 -->
 							-XepExcludedPaths:.*/src/test/java/.*

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/support/MethodInvoker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-present 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.
@@ -26,6 +26,6 @@
  */
 public interface MethodInvoker {
 
-	@Nullable Object invokeMethod(Object... args);
+	@Nullable Object invokeMethod(@Nullable Object... args);
 
 }

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/support/SimpleMethodInvoker.java

@@ -1,21 +1,5 @@
 /*
- * Copyright 2002-2023 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-present 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.
@@ -83,10 +67,10 @@ private static Method getMethodIfAvailable(Class<?> clazz, String methodName, Cl
 	}
 
 	@Override
-	public @Nullable Object invokeMethod(Object... args) {
+	public @Nullable Object invokeMethod(@Nullable Object... args) {
 
 		Class<?>[] parameterTypes = method.getParameterTypes();
-		Object[] invokeArgs;
+		@Nullable Object[] invokeArgs;
 		if (parameterTypes.length == 0) {
 			invokeArgs = new Object[] {};
 		}