Merge pull request #11592 from eugenp/JAVA-8794

JAVA-8794: Upgrade to Spring Boot 2.6.1

spring-boot-modules/spring-boot-environment/pom.xml

@@ -140,7 +140,7 @@
         <guava.version>18.0</guava.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <httpclient.version>4.5.8</httpclient.version>
-        <spring.cloud-version>2020.0.0</spring.cloud-version>
+        <spring.cloud-version>2021.0.0</spring.cloud-version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/JobRunrSpringBootApp.java

@@ -1,15 +1,11 @@
 package com.baeldung;
 
 import com.baeldung.jobrunr.service.SampleJobService;
-import org.jobrunr.jobs.mappers.JobMapper;
 import org.jobrunr.scheduling.JobScheduler;
 import org.jobrunr.scheduling.cron.Cron;
-import org.jobrunr.storage.InMemoryStorageProvider;
-import org.jobrunr.storage.StorageProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 
 import javax.annotation.PostConstruct;
 
@@ -23,13 +19,6 @@ public class JobRunrSpringBootApp {
         SpringApplication.run(JobRunrSpringBootApp.class, args);
     }
 
-    @Bean
-    public StorageProvider storageProvider(JobMapper jobMapper) {
-        InMemoryStorageProvider storageProvider = new InMemoryStorageProvider();
-        storageProvider.setJobMapper(jobMapper);
-        return storageProvider;
-    }
-
     @PostConstruct
     public void scheduleRecurrently() {
         jobScheduler.<SampleJobService>scheduleRecurrently(Cron.every5minutes(), x -> x.executeSampleJob("a recurring job"));

spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/config/StorageProviderConfig.java

@@ -0,0 +1,18 @@
+package com.baeldung.config;
+
+import org.jobrunr.jobs.mappers.JobMapper;
+import org.jobrunr.storage.InMemoryStorageProvider;
+import org.jobrunr.storage.StorageProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class StorageProviderConfig {
+
+    @Bean
+    public StorageProvider storageProvider(JobMapper jobMapper) {
+        InMemoryStorageProvider storageProvider = new InMemoryStorageProvider();
+        storageProvider.setJobMapper(jobMapper);
+        return storageProvider;
+    }
+}

spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties

@@ -1 +1,2 @@
-spring.thymeleaf.view-names=thymeleaf/*
+spring.thymeleaf.view-names=thymeleaf/*
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher

spring-boot-modules/spring-boot-properties/pom.xml

@@ -122,7 +122,7 @@
     </profiles>
 
     <properties>
-        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-cloud.version>2021.0.0</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>
         <resource.delimiter>@</resource.delimiter>

spring-boot-modules/spring-boot-runtime/pom.xml

@@ -95,7 +95,7 @@
         <jpa.version>2.2</jpa.version>
         <guava.version>18.0</guava.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
-        <springcloud.version>3.0.2</springcloud.version>
+        <springcloud.version>3.1.0</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
     </properties>
 

spring-boot-modules/spring-boot-springdoc/pom.xml

@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
         </dependency>
         <!-- SpringDoc -->
         <dependency>
@@ -207,10 +206,9 @@
     </profiles>
 
     <properties>
-        <hibernate.version>5.2.10.Final</hibernate.version>
         <springdoc.version>1.5.2</springdoc.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
-        <kotlin.version>1.4.0</kotlin.version>
+        <kotlin.version>1.6.0</kotlin.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
     </properties>
 

spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties

@@ -11,4 +11,6 @@ spring.datasource.url=jdbc:h2:mem:springdoc
 ## for com.baeldung.restdocopenapi ##
 springdoc.version=@springdoc.version@
 spring.jpa.hibernate.ddl-auto=none
-######################################
+######################################
+
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher