From 072fc80cdbf87a3ee76cacdb15825fc43786b830 Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Thu, 13 Jun 2024 10:27:57 +0000 Subject: [PATCH 1/2] Next development version (v6.1.10-SNAPSHOT) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 24b8ce330f8..3eceaf96a57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=6.1.9-SNAPSHOT +version=6.1.10-SNAPSHOT org.gradle.caching=true org.gradle.jvmargs=-Xmx2048m From d0aa7ad524a41812bf1d2c64f013def553a1b32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 13 Jun 2024 14:06:19 +0200 Subject: [PATCH 2/2] Fix invalid character in Javadoc of BeanFactory --- .../java/org/springframework/beans/factory/BeanFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java index 9e890e5d1ed..8973cf271e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java @@ -243,7 +243,7 @@ public interface BeanFactory { * specific type, specify the actual bean type as an argument here and subsequently * use {@link ObjectProvider#orderedStream()} or its lazy streaming/iteration options. *

Also, generics matching is strict here, as per the Java assignment rules. - * For lenient fallback matching with unchecked semantics (similar to the ´unchecked´ + * For lenient fallback matching with unchecked semantics (similar to the 'unchecked' * Java compiler warning), consider calling {@link #getBeanProvider(Class)} with the * raw type as a second step if no full generic match is * {@link ObjectProvider#getIfAvailable() available} with this variant.