From 69087badab8cff87dc8bbb0bf60d743ae6117e4b Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Thu, 23 Mar 2023 08:44:57 +0000 Subject: [PATCH 1/2] Next development version (v2.7.11-SNAPSHOT) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 60fea604d5..5b5e7fb325 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.7.10-SNAPSHOT +version=2.7.11-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true From fa63f6cc9ecf4d7965605b06f25cec0e348ca6e8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 23 Mar 2023 09:46:15 +0000 Subject: [PATCH 2/2] Stop using an instance supplier in EntityScanPackages' bean definition Closes gh-34371 --- .../boot/autoconfigure/domain/EntityScanPackages.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java index b947aad3bd..d2ab6e88a0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.function.Supplier; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -170,13 +169,9 @@ public class EntityScanPackages { addPackageNames(packageNames); } - @Override - public Supplier getInstanceSupplier() { - return () -> new EntityScanPackages(StringUtils.toStringArray(this.packageNames)); - } - private void addPackageNames(Collection additionalPackageNames) { this.packageNames.addAll(additionalPackageNames); + getConstructorArgumentValues().addIndexedArgumentValue(0, StringUtils.toStringArray(this.packageNames)); } }