[JAVA-13976] Upgrade Spring Boot to 2.7.2 (#12603)

* [JAVA-13976] Upgrade Spring Boot to 2.7.2

* [JAVA-13976] Fix failing test due to incorrect Jackson version

graphql-modules/graphql-error-handling/pom.xml

@@ -36,12 +36,10 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -51,13 +49,12 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
             <version>${graphql-spring-boot-starter.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
-            <version>${jsonassert.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -65,7 +62,6 @@
     <properties>
         <graphql-spring-boot-starter.version>5.0.2</graphql-spring-boot-starter.version>
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
-        <jsonassert.version>1.5.0</jsonassert.version>
     </properties>
 
 </project>

graphql-modules/graphql-error-handling/src/main/java/com/baeldung/graphql/error/handling/exception/GraphQLErrorAdapter.java

@@ -1,6 +1,6 @@
 package com.baeldung.graphql.error.handling.exception;
 
-import graphql.ErrorType;
+import graphql.ErrorClassification;
 import graphql.ExceptionWhileDataFetching;
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
@@ -27,7 +27,7 @@ public class GraphQLErrorAdapter implements GraphQLError {
     }
 
     @Override
-    public ErrorType getErrorType() {
+    public ErrorClassification getErrorType() {
         return error.getErrorType();
     }
 

mustache/pom.xml

@@ -55,7 +55,7 @@
     </build>
 
     <properties>
-        <mustache.compiler.api.version>0.9.2</mustache.compiler.api.version>
+        <mustache.compiler.api.version>0.9.10</mustache.compiler.api.version>
         <datafactory.version>0.8</datafactory.version>
         <webjars.bootstrap.version>3.3.7</webjars.bootstrap.version>
     </properties>

mustache/src/main/java/com/baeldung/springmustache/SpringMustacheApplication.java

@@ -1,12 +1,11 @@
 package com.baeldung.springmustache;
 
+import com.samskivert.mustache.DefaultCollector;
 import com.samskivert.mustache.Mustache;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mustache.MustacheEnvironmentCollector;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.core.env.Environment;
 
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.baeldung"})
@@ -17,16 +16,11 @@ public class SpringMustacheApplication {
     }
 
     @Bean
-    public Mustache.Compiler mustacheCompiler(Mustache.TemplateLoader templateLoader, Environment environment) {
-
-        MustacheEnvironmentCollector collector = new MustacheEnvironmentCollector();
-        collector.setEnvironment(environment);
-
+    public Mustache.Compiler mustacheCompiler(Mustache.TemplateLoader templateLoader) {
         return Mustache.compiler()
           .defaultValue("Some Default Value")
           .withLoader(templateLoader)
-          .withCollector(collector);
-
+          .withCollector(new DefaultCollector());
     }
 }
 

parent-boot-2/pom.xml

@@ -88,8 +88,8 @@
         <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
-        <spring-boot.version>2.6.4</spring-boot.version>
+        <spring-boot.version>2.7.2</spring-boot.version>
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
     </properties>
 
-</project>
+</project>

persistence-modules/flyway/pom.xml

@@ -19,7 +19,6 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>${flyway-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -64,8 +63,8 @@
     </build>
 
     <properties>
-        <flyway-core.version>8.0.0</flyway-core.version>
-        <flyway-maven-plugin.version>8.0.0</flyway-maven-plugin.version>
+        <flyway-maven-plugin.version>8.5.13</flyway-maven-plugin.version>
+        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>

persistence-modules/spring-boot-persistence-mongodb-2/pom.xml

@@ -27,13 +27,8 @@
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <version>${embed.mongo.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <properties>
-        <embed.mongo.version>3.2.6</embed.mongo.version>
-    </properties>
-
 </project>

persistence-modules/spring-data-jpa-repo-2/src/main/resources/application.properties

@@ -1,3 +1,5 @@
 spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
 spring.datasource.username=sa
-spring.datasource.password=sa
+spring.datasource.password=sa
+
+spring.jpa.properties.hibernate.globally_quoted_identifiers=true

persistence-modules/spring-data-mongodb-reactive/pom.xml

@@ -57,7 +57,6 @@
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <version>${embed.mongo.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -127,7 +126,6 @@
         <spring-tx.version>5.3.15</spring-tx.version>
         <httpclient.version>4.5.2</httpclient.version>
         <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
-        <embed.mongo.version>3.2.6</embed.mongo.version>
     </properties>
 
 </project>

persistence-modules/spring-data-rest-querydsl/src/main/resources/application.yml

@@ -9,3 +9,5 @@ spring:
     jpa:
         hibernate:
             ddl-auto: create
+        properties:
+            globally_quoted_identifiers: true

persistence-modules/spring-data-rest-querydsl/src/test/resources/application.yml

@@ -8,4 +8,5 @@ spring:
       ddl-auto: create-drop
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.H2Dialect 
+        dialect: org.hibernate.dialect.H2Dialect
+        globally_quoted_identifiers: true

pom.xml

@@ -583,7 +583,7 @@
 
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-jersey</module>
-                <module>spring-jinq</module>
+                <!-- <module>spring-jinq</module> --> <!-- does not work with Spring Boot 2.7.2 -->
                 <module>spring-jms</module>
 
                 <module>spring-kafka</module>
@@ -977,7 +977,7 @@
 
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-jersey</module>
-                <module>spring-jinq</module>
+                <!-- <module>spring-jinq</module> --> <!-- does not support work with Spring Boot 2.7.2 -->
                 <module>spring-jms</module>
 
                 <module>spring-kafka</module>

spring-boot-modules/spring-boot-data-2/pom.xml

@@ -41,7 +41,7 @@
     </dependencies>
 
     <properties>
-        <javers.version>6.5.3</javers.version>
+        <javers.version>6.6.5</javers.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/annotation/scanner/AnnotationScannerApp.java

@@ -0,0 +1,16 @@
+package com.baeldung.annotation.scanner;
+
+import org.jobrunr.autoconfigure.JobRunrAutoConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@EnableAutoConfiguration(exclude = { JobRunrAutoConfiguration.class})
+public class AnnotationScannerApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AnnotationScannerApp.class, args);
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.jobrunr;
 
 import com.baeldung.jobrunr.service.SampleJobService;
 import org.jobrunr.scheduling.JobScheduler;

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

@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.jobrunr.config;
 
 import org.jobrunr.jobs.mappers.JobMapper;
 import org.jobrunr.storage.InMemoryStorageProvider;

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

@@ -0,0 +1,13 @@
+package com.baeldung.sprq;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpqrApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpqrApp.class, args);
+    }
+
+}

spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/annotation/scanner/SampleAnnotationScannerUnitTest.java

@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.junit.Assert.*;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = AnnotationScannerApp.class)
 public class SampleAnnotationScannerUnitTest {
     @Autowired
     private List<SampleAnnotationScanner> scannerList;

spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/jobrunr/JobRunrLiveTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.jobrunr;
 
-import org.awaitility.Awaitility;
 import org.jobrunr.jobs.states.StateName;
 import org.jobrunr.storage.StorageProvider;
 import org.junit.Test;
@@ -10,8 +9,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.JobRunrSpringBootApp;
-
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 

spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/sprq/GraphqlControllerIntegrationTest.java

@@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = SpqrApp.class)
 @AutoConfigureMockMvc
 public class GraphqlControllerIntegrationTest {
 

spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java

@@ -77,7 +77,7 @@ public class PersistenceConfig {
         final Properties hibernateProperties = new Properties();
         hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
         hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+        hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
         return hibernateProperties;
     }
 

spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java

@@ -59,8 +59,7 @@ public class ErrorHandlingLiveTest {
             webClient.getOptions()
                 .setThrowExceptionOnFailingStatusCode(false);
             HtmlPage page = webClient.getPage(EXCEPTION_ENDPOINT);
-            assertThat(page.getBody()
-                .asText()).contains("Whitelabel Error Page");
+            assertThat(page.getBody().asNormalizedText()).contains("Whitelabel Error Page");
         }
     }
 }

spring-cloud-modules/pom.xml

@@ -85,7 +85,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
         <spring-cloud-starter-config.version>2.2.3.RELEASE</spring-cloud-starter-config.version>
         <spring-cloud-config-server.version>2.2.3.RELEASE</spring-cloud-config-server.version>
         <spring-cloud-starter-eureka.version>1.4.7.RELEASE</spring-cloud-starter-eureka.version>
@@ -94,4 +94,4 @@
         <spring-cloud-stream.version>3.1.3</spring-cloud-stream.version>
     </properties>
 
-</project>
+</project>

spring-cloud-modules/spring-cloud-bus/pom.xml

@@ -33,7 +33,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
     </properties>
 
-</project>
+</project>

spring-cloud-modules/spring-cloud-config/pom.xml

@@ -33,7 +33,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
     </properties>
 
-</project>
+</project>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml

@@ -32,6 +32,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+            <version>${spring.cloud.k8s.config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -54,6 +55,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-kubernetes-ribbon</artifactId>
+            <version>${spring.cloud.k8s.config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -83,7 +85,8 @@
     </build>
 
     <properties>
-        <spring.cloud.k8s.version>1.1.8.RELEASE</spring.cloud.k8s.version>
+        <spring.cloud.k8s.version>2.1.3</spring.cloud.k8s.version>
+        <spring.cloud.k8s.config.version>1.1.10.RELEASE</spring.cloud.k8s.config.version>
     </properties>
 
-</project>
+</project>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java

@@ -3,11 +3,8 @@ package com.baeldung.spring.cloud.kubernetes.client;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -15,12 +12,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @RibbonClient(name = "travel-agency-service", configuration = RibbonConfiguration.class)
 public class Application {
 
-    @LoadBalanced
-    @Bean
-    RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml

@@ -1,6 +1,15 @@
 spring:
   application.name: client-service
-  cloud.kubernetes.reload.enabled: true
+  cloud:
+    kubernetes:
+      reload:
+        enabled: true
+      discovery:
+        enabled: true
+        all-namespaces: false
+        primary-port-name: "default-http"
+        discovery-server-url: "http://myapp-discoveryserver"
+        include-not-ready-addresses: true
 server.port: 8080
 management:
   endpoint:

spring-cloud-modules/spring-cloud-kubernetes/pom.xml

@@ -33,7 +33,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
     </properties>
 
 </project>

spring-cloud-modules/spring-cloud-openfeign/pom.xml

@@ -64,7 +64,7 @@
     </dependencies>
 
     <properties>
-        <spring-cloud.version>2021.0.0</spring-cloud.version>
+        <spring-cloud.version>2021.0.3</spring-cloud.version>
     </properties>
 
-</project>
+</project>