feat: Adapt to a new auto configuration in Spring Boot (#14659)

Spring Boot introduced a new location for auto configuration entries in spring boot 2.7.0. The new location is META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports. This has until spring boot 3.0.0-M5 worked in parallel with the spring.factories configuration. The spring.factories support was removed in spring boot 3.0.0-M5 so this move has to be done now in order for the auto configuration to be picked up. Fixes #14628 Picked to master from #14629 Co-authored-by: @aspan
vaadin · Sep 28, 2022 · 4509a3f · 4509a3f
1 parent 5073899
commit 4509a3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vaadin-spring/src/main/resources/META-INF/spring.factories b/vaadin-spring/src/main/resources/META-INF/spring.factories
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.vaadin.flow.spring.SpringBootAutoConfiguration,com.vaadin.flow.spring.SpringSecurityAutoConfiguration,com.vaadin.flow.spring.VaadinScopesConfig
 org.springframework.boot.SpringApplicationRunListener=com.vaadin.flow.spring.DevModeBrowserLauncher
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.vaadin.flow.spring.SpringBootAutoConfiguration
+com.vaadin.flow.spring.SpringSecurityAutoConfiguration
+com.vaadin.flow.spring.VaadinScopesConfig
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.vaadin.flow.spring.SpringBootAutoConfiguration,com.vaadin.flow.spring.SpringSecurityAutoConfiguration,com.vaadin.flow.spring.VaadinScopesConfig
		org.springframework.boot.SpringApplicationRunListener=com.vaadin.flow.spring.DevModeBrowserLauncher