From 99b3e205d1993870f56f48d398054b262de605f7 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Wed, 27 May 2026 10:03:56 -0700 Subject: [PATCH 1/2] Update to NullAway 0.13.6 Add missing nullness annotation in UriComponents.VarArgsTemplateVariables to fix new warnings. Closes gh-36850 Signed-off-by: Manu Sridharan --- gradle/spring-module.gradle | 2 ++ .../main/java/org/springframework/web/util/UriComponents.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle index 1a4ff436aa6..df127589a90 100644 --- a/gradle/spring-module.gradle +++ b/gradle/spring-module.gradle @@ -117,6 +117,8 @@ publishing { } } +nullability { nullAwayVersion = "0.13.6" } + // Disable publication of test fixture artifacts. components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() } components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() } diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java index 373215c584e..732f26a79cf 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java @@ -345,7 +345,7 @@ public abstract class UriComponents implements Serializable { */ private static class VarArgsTemplateVariables implements UriTemplateVariables { - private final Iterator valueIterator; + private final Iterator<@Nullable Object> valueIterator; public VarArgsTemplateVariables(@Nullable Object... uriVariableValues) { this.valueIterator = Arrays.asList(uriVariableValues).iterator(); From 347f23a73fefcc5b3ec987db6e6d61baa4841789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Wed, 1 Jul 2026 15:27:28 +0200 Subject: [PATCH 2/2] Upgrade nullability plugin to 0.0.14 Nullaway 0.13.7 is now the default. See gh-36850 --- build.gradle | 2 +- gradle/spring-module.gradle | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f7ff096497a..1dcdd2409af 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'com.github.bjornvester.xjc' version '1.8.2' apply false id 'com.gradleup.shadow' version "9.2.2" apply false id 'me.champeau.jmh' version '0.7.2' apply false - id 'io.spring.nullability' version '0.0.11' apply false + id 'io.spring.nullability' version '0.0.14' apply false } ext { diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle index df127589a90..1a4ff436aa6 100644 --- a/gradle/spring-module.gradle +++ b/gradle/spring-module.gradle @@ -117,8 +117,6 @@ publishing { } } -nullability { nullAwayVersion = "0.13.6" } - // Disable publication of test fixture artifacts. components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() } components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }