Adopt Spring Boot changes

Author: AB-xdev

demo/webapp-shared/pom.xml

@@ -19,6 +19,11 @@
 		</dependency>
 
 		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-flyway</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>

demo/webapp-shared/src/main/java/software/xdev/sse/demo/DemoJPAConfig.java

@@ -6,8 +6,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 

demo/webapp-shared/src/main/java/software/xdev/sse/demo/init/DemoFlywayConfigurationCustomizer.java

@@ -1,7 +1,7 @@
 package software.xdev.sse.demo.init;
 
 import org.flywaydb.core.api.configuration.FluentConfiguration;
-import org.springframework.boot.autoconfigure.flyway.FlywayConfigurationCustomizer;
+import org.springframework.boot.flyway.autoconfigure.FlywayConfigurationCustomizer;
 import org.springframework.stereotype.Component;
 
 import software.xdev.sse.demo.persistence.FlywayInfo;

demo/webapp-vaadin/src/main/java/software/xdev/sse/demo/Application.java

@@ -5,21 +5,19 @@
 import java.util.stream.Stream;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
+import org.springframework.boot.webmvc.autoconfigure.error.ErrorMvcAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import com.vaadin.flow.spring.annotation.EnableVaadin;
 
 
 @SuppressWarnings({"checkstyle:HideUtilityClassConstructor", "PMD.UseUtilityClass"})
-@SpringBootApplication
+@SpringBootApplication(exclude = {ErrorMvcAutoConfiguration.class})
 @EnableScheduling
 @EnableAsync
 @EnableVaadin("software.xdev.sse.demo.ui")
-@EnableAutoConfiguration(exclude = {ErrorMvcAutoConfiguration.class})
 public class Application
 {
 	@SuppressWarnings("PMD.AvoidSystemSetterCall")

web-sidecar-common/src/main/java/software/xdev/sse/web/sidecar/auto/CommonSidecarsAutoConfig.java

@@ -22,7 +22,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.boot.web.error.ErrorPageRegistry;
 import org.springframework.context.annotation.Bean;
 
 import software.xdev.sse.web.sidecar.OtherWebSecurityPaths;

web-sidecar-common/src/main/java/software/xdev/sse/web/sidecar/errorpage/ErrorPageCompatibilityPathsProvider.java

@@ -23,9 +23,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.error.ErrorPage;
+import org.springframework.boot.web.error.ErrorPageRegistry;
 import org.springframework.boot.web.server.AbstractConfigurableWebServerFactory;
-import org.springframework.boot.web.server.ErrorPage;
-import org.springframework.boot.web.server.ErrorPageRegistry;
 
 import software.xdev.sse.web.sidecar.public_stateless.PublicStatelessPathsProvider;
 

web/src/main/java/software/xdev/sse/web/cookie/auto/CookieAutoConfig.java

@@ -19,7 +19,7 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.servlet.server.CookieSameSiteSupplier;
+import org.springframework.boot.web.server.servlet.CookieSameSiteSupplier;
 import org.springframework.context.annotation.Bean;
 
 import software.xdev.sse.web.cookie.CookieSecureService;