Merge pull request #10311 from kwoyke/JAVA-3570

JAVA-3570: Upgrade parent-boot-2 to Spring Boot 2.4.0

libraries-security/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>${spring-boot.version}</version>
+            <version>${spring-security-oauth2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -88,6 +88,7 @@
         <bouncycastle.version>1.58</bouncycastle.version>
         <jsch.version>0.1.55</jsch.version>
         <apache-mina.version>2.5.1</apache-mina.version>
+        <spring-security-oauth2.version>2.4.0.RELEASE</spring-security-oauth2.version>
     </properties>
 
 </project>

parent-boot-2/pom.xml

@@ -82,7 +82,7 @@
         <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
-        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+        <spring-boot.version>2.4.0</spring-boot.version>
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
     </properties>
 

persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java

@@ -10,15 +10,15 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baeldung.spring.redis.configuration.entity.Book;
 import com.baeldung.spring.redis.configuration.repository.BooksRepository;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class BooksControllerUnitTest {
 
-    @Spy
     @InjectMocks
     private BooksController booksController;
 

persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java

@@ -11,16 +11,16 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baeldung.spring.redis.configuration.entity.Book;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class BooksRepositoryUnitTest {
 
-    @Spy
     @InjectMocks
     private BooksRepository booksRepository;
 

spring-5-reactive-client/pom.xml

@@ -176,6 +176,7 @@
         <commons-collections4.version>4.1</commons-collections4.version>
         <jetty-reactive-httpclient.version>1.0.3</jetty-reactive-httpclient.version>
         <okhttp.version>4.0.1</okhttp.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-5-webflux/pom.xml

@@ -64,4 +64,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+    </properties>
+
 </project>

spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml

@@ -86,5 +86,6 @@
         <spring-boot-admin-starter-client.version>2.2.2</spring-boot-admin-starter-client.version>
         <spring-boot-admin-server-ui-login.version>1.5.7</spring-boot-admin-server-ui-login.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 </project>

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

@@ -197,6 +197,7 @@
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <springcloud.version>2.0.2.RELEASE</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

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

@@ -144,6 +144,7 @@
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <springcloud.version>2.0.2.RELEASE</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

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

@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
@@ -173,7 +173,7 @@
         <hibernate.version>5.2.10.Final</hibernate.version>
         <springdoc.version>1.2.32</springdoc.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
-        <kotlin.version>1.2.71</kotlin.version>
+        <kotlin.version>1.4.0</kotlin.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
     </properties>
 
@@ -185,7 +185,7 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                        <version>2.2.2.RELEASE</version>
+                        <version>${spring-boot.version}</version>
                         <executions>
                             <execution>
                                 <id>pre-integration-test</id>

spring-cloud-bus/pom.xml

@@ -35,6 +35,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

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

@@ -34,7 +34,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
-
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

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

@@ -25,5 +25,6 @@
     </modules>
 
     <properties>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 </project>

spring-cloud/spring-cloud-ribbon-client/pom.xml

@@ -46,6 +46,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-security/pom.xml

@@ -21,5 +21,6 @@
     </modules>
 
     <properties>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 </project>

spring-cloud/spring-cloud-zookeeper/pom.xml

@@ -20,6 +20,7 @@
     <properties>
         <springframework.version>5.2.7.RELEASE</springframework.version>
         <spring-cloud-starter-zookeeper-discovery.version>1.0.3.RELEASE</spring-cloud-starter-zookeeper-discovery.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-zuul/pom.xml

@@ -80,7 +80,7 @@
 
     <properties>
         <spring-cloud.version>Hoxton.SR4</spring-cloud.version>
-
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-core-2/pom.xml

@@ -198,7 +198,7 @@
     <properties>
         <start-class>com.baeldung.sample.App</start-class>
         <!-- Spring -->
-        <org.springframework.version>5.2.2.RELEASE</org.springframework.version>
+        <org.springframework.version>5.3.0</org.springframework.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>

spring-data-rest/pom.xml

@@ -99,6 +99,7 @@
     <properties>
         <start-class>com.baeldung.books.SpringDataRestApplication</start-class>
         <maven.version>1.0</maven.version>
+        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-mvc-basics/src/main/resources/application.properties

@@ -5,3 +5,6 @@ spring.mvc.pathmatch.use-suffix-pattern=true
 #spring.mvc.contentnegotiation.favor-path-extension=true
 #spring.mvc.contentnegotiation.favor-parameter=true
 #spring.mvc.contentnegotiation.parameter-name=mediaType
+
+# https://github.com/spring-projects/spring-boot/issues/24207
+spring.main.allow-bean-definition-overriding=true

spring-security-modules/spring-security-oauth2-sso/pom.xml

@@ -24,8 +24,8 @@
 
     <properties>
         <rest-assured.version>3.1.0</rest-assured.version>
-        <oauth.version>2.3.3.RELEASE</oauth.version>
+        <oauth.version>2.4.0.RELEASE</oauth.version>
-        <oauth-auto.version>2.1.1.RELEASE</oauth-auto.version>
+        <oauth-auto.version>2.4.0</oauth-auto.version>
         <spring-security-kerberos.version>1.0.1.RELEASE</spring-security-kerberos.version>
         <apacheds-jdbm1.version>2.0.0-M2</apacheds-jdbm1.version>
     </properties>

spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/src/main/resources/application.yml

@@ -2,6 +2,7 @@ server:
     port: 8083
     servlet:
       context-path: /ui2
+      register-default-servlet: true
     session:
       cookie:
         name: UI2SESSION

spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/src/main/resources/application.yml

@@ -2,6 +2,7 @@ server:
     port: 8082
     servlet:
       context-path: /ui
+      register-default-servlet: true
     session:
       cookie:
         name: UISESSION

spring-security-modules/spring-security-web-mvc/pom.xml

@@ -61,27 +61,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <version>${spring.mvc.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.mvc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring.mvc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.mvc.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -104,7 +83,6 @@
     </build>
 
     <properties>
-        <spring.mvc.version>5.2.2.RELEASE</spring.mvc.version>
         <javax.version>4.0.1</javax.version>
     </properties>
 

spring-social-login/src/main/resources/application.properties

@@ -1,3 +1,4 @@
 spring.social.facebook.appId=1715784745414888
 spring.social.facebook.appSecret=abefd6497e9cc01ad03be28509617bf0
 spring.thymeleaf.cache=false
+server.servlet.register-default-servlet=true

testing-modules/spring-testing/pom.xml

@@ -114,7 +114,7 @@
         <awaitility.version>3.1.6</awaitility.version>
         <junit.jupiter.version>5.7.0</junit.jupiter.version>
         <junit.commons.version>1.7.0</junit.commons.version>
-        <spring.version>5.2.8.RELEASE</spring.version>
+        <spring.version>5.3.0</spring.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <javax.persistence.version>2.1.1</javax.persistence.version>
     </properties>