From 2d09274e409b51251a39b7ed96e4171c3af265c3 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 11:45:02 +0100 Subject: [PATCH 01/25] JAVA-3570: Upgrade parent-boot-2 to Spring Boot 2.4.0 --- parent-boot-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml index dab9f015b3..2ee4f1483b 100644 --- a/parent-boot-2/pom.xml +++ b/parent-boot-2/pom.xml @@ -82,7 +82,7 @@ 3.3.0 1.0.22.RELEASE - 2.3.3.RELEASE + 2.4.0 1.9.1 From 212f1ed72dc752ea368c651a4dfa35b3720baa53 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 12:06:43 +0100 Subject: [PATCH 02/25] JAVA-3570: Keep spring-data-rest on Spring Boot 2.3.3 --- spring-data-rest/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml index 63a42857f4..dd96182264 100644 --- a/spring-data-rest/pom.xml +++ b/spring-data-rest/pom.xml @@ -99,6 +99,7 @@ com.baeldung.books.SpringDataRestApplication 1.0 + 2.3.3.RELEASE \ No newline at end of file From 50c668c300345ce9ab548c750ccb37f297a53d8d Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 12:16:24 +0100 Subject: [PATCH 03/25] JAVA-3570: Fix spring-security-oauth2 version in libraries-security --- libraries-security/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml index 202b3b8763..3b812f0d2c 100644 --- a/libraries-security/pom.xml +++ b/libraries-security/pom.xml @@ -21,7 +21,7 @@ org.springframework.security.oauth spring-security-oauth2 - ${spring-boot.version} + ${spring-security-oauth2.version} org.springframework @@ -88,6 +88,7 @@ 1.58 0.1.55 2.5.1 + 2.4.0.RELEASE From 8f5f322273fb2ca0eb258b94906135506be45dc8 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 13:05:54 +0100 Subject: [PATCH 04/25] JAVA-3570: Keep spring-5-reactive-client on Spring Boot 2.3.3 --- spring-5-reactive-client/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml index 7ae7ba6edd..5b773cc63f 100644 --- a/spring-5-reactive-client/pom.xml +++ b/spring-5-reactive-client/pom.xml @@ -176,6 +176,7 @@ 4.1 1.0.3 4.0.1 + 2.3.3.RELEASE From 8a264a9981db9413b51f7a571e0a303c909dd1d8 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 13:16:09 +0100 Subject: [PATCH 05/25] JAVA-3570: Fix unit tests in persistence-modules/redis --- .../configuration/controller/BooksControllerUnitTest.java | 4 ++-- .../configuration/repository/BooksRepositoryUnitTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java index a5c3340065..757b32385b 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java +++ b/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; diff --git a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java index 1edf9c7e89..f32800e165 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java +++ b/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; From ee0d98b8a56d6fef4a774b0f3156640a7bbafe9e Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 13:38:50 +0100 Subject: [PATCH 06/25] JAVA-3570: Keep spring-5-webflux on Spring Boot 2.3.3 --- spring-5-webflux/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml index 292e4d7ad9..48b5b823fb 100644 --- a/spring-5-webflux/pom.xml +++ b/spring-5-webflux/pom.xml @@ -64,4 +64,8 @@ + + 2.3.3.RELEASE + + From e6a310c4fb94132dd9d910b6d9a90412561d44cf Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 14:14:59 +0100 Subject: [PATCH 07/25] JAVA-3570: Keep spring-boot-admin on Spring Boot 2.3.3 --- .../spring-boot-admin/spring-boot-admin-server/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml index 4c1dcdef6b..558aed8b26 100644 --- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml +++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml @@ -86,5 +86,6 @@ 2.2.2 1.5.7 2.0.4.RELEASE + 2.3.3.RELEASE From c008e43ea817b79547f9039fa4c9db05f80e44b0 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 21:56:46 +0100 Subject: [PATCH 08/25] JAVA-3570: Update Kotlin version in spring-boot-springdoc --- spring-boot-modules/spring-boot-springdoc/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-modules/spring-boot-springdoc/pom.xml b/spring-boot-modules/spring-boot-springdoc/pom.xml index ed272200da..d4622e0595 100644 --- a/spring-boot-modules/spring-boot-springdoc/pom.xml +++ b/spring-boot-modules/spring-boot-springdoc/pom.xml @@ -81,7 +81,7 @@ org.jetbrains.kotlin - kotlin-stdlib-jre8 + kotlin-stdlib-jdk8 ${kotlin.version} @@ -173,7 +173,7 @@ 5.2.10.Final 1.2.32 1.5.6 - 1.2.71 + 1.4.0 ${project.build.directory}/generated-snippets @@ -185,7 +185,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.2.2.RELEASE + ${spring-boot.version} pre-integration-test From 19ab1ccf2b3cda5a0fdfdaf3b4d74a2d38c0af6d Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 11 Dec 2020 22:17:40 +0100 Subject: [PATCH 09/25] JAVA-3570: Use Spring Boot starters in spring-security-web-mvc --- .../spring-security-web-mvc/pom.xml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/spring-security-modules/spring-security-web-mvc/pom.xml b/spring-security-modules/spring-security-web-mvc/pom.xml index 2651b3a0f2..b1e94b2db3 100644 --- a/spring-security-modules/spring-security-web-mvc/pom.xml +++ b/spring-security-modules/spring-security-web-mvc/pom.xml @@ -61,27 +61,6 @@ spring-boot-starter-test test - - org.springframework.security - spring-security-test - ${spring.mvc.version} - test - - - org.springframework.security - spring-security-web - ${spring.mvc.version} - - - org.springframework.security - spring-security-config - ${spring.mvc.version} - - - org.springframework - spring-webmvc - ${spring.mvc.version} - javax.servlet javax.servlet-api @@ -104,7 +83,6 @@ - 5.2.2.RELEASE 4.0.1 From 1f8efc0c144814a054ff6833803996e9680897b5 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 10:18:38 +0100 Subject: [PATCH 10/25] JAVA-3570: Keep spring-boot-environment on Spring Boot 2.3.3 [cloud] --- spring-boot-modules/spring-boot-environment/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml index 694e17fd72..d34bbd18c0 100644 --- a/spring-boot-modules/spring-boot-environment/pom.xml +++ b/spring-boot-modules/spring-boot-environment/pom.xml @@ -144,6 +144,7 @@ 3.1.7 2.0.2.RELEASE 4.5.8 + 2.3.3.RELEASE From 1a3ec076dca9c7c577c8ad4b0bd0fee12f5e0c5e Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 10:21:03 +0100 Subject: [PATCH 11/25] JAVA-3570: Keep spring-boot-deployment on Spring Boot 2.3.3 [cloud] --- spring-boot-modules/spring-boot-deployment/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/spring-boot-deployment/pom.xml b/spring-boot-modules/spring-boot-deployment/pom.xml index 6b5e75bd62..94a4018103 100644 --- a/spring-boot-modules/spring-boot-deployment/pom.xml +++ b/spring-boot-modules/spring-boot-deployment/pom.xml @@ -197,6 +197,7 @@ 3.1.7 2.0.2.RELEASE 4.5.8 + 2.3.3.RELEASE From adbd9ecfb97ca9facc72c596ef26bf18bb3b4864 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 10:23:23 +0100 Subject: [PATCH 12/25] JAVA-3570: Keep spring-cloud on Spring Boot 2.3.3 [cloud] --- spring-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index c0e452afaf..c7f6dc56a0 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -84,7 +84,7 @@ 1.4.7.RELEASE 1.4.7.RELEASE 3.0.6.RELEASE - + 2.3.3.RELEASE From 9e957f2fd03be867521d5d20107a34f87011e552 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 10:41:20 +0100 Subject: [PATCH 13/25] JAVA-3570: themeResolver bean can no longer be configured without enabling bean overriding --- spring-mvc-basics/src/main/resources/application.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-mvc-basics/src/main/resources/application.properties b/spring-mvc-basics/src/main/resources/application.properties index b8a9be0b40..cf26fbfb60 100644 --- a/spring-mvc-basics/src/main/resources/application.properties +++ b/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 From 07276b1aaa00824f55f3d88d4eacc37cbb52586d Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 10:59:45 +0100 Subject: [PATCH 14/25] JAVA-3570: Upgrade Spring framework to version compatible with Spring Boot 2.4 in spring-testing --- testing-modules/spring-testing/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml index f26b0f27ec..9fe0fd8895 100644 --- a/testing-modules/spring-testing/pom.xml +++ b/testing-modules/spring-testing/pom.xml @@ -114,7 +114,7 @@ 3.1.6 5.7.0 1.7.0 - 5.2.8.RELEASE + 5.3.0 4.0.1 2.1.1 From 127a377b81f7fee82bc2b8ad32b08e1866035c38 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 11:00:28 +0100 Subject: [PATCH 15/25] Revert "JAVA-3570: Keep spring-cloud on Spring Boot 2.3.3 [cloud]" This reverts commit adbd9ecfb97ca9facc72c596ef26bf18bb3b4864. --- spring-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index c7f6dc56a0..c0e452afaf 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -84,7 +84,7 @@ 1.4.7.RELEASE 1.4.7.RELEASE 3.0.6.RELEASE - 2.3.3.RELEASE + From b4ccf851d315acdb38056b69961435ce28929861 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 11:02:50 +0100 Subject: [PATCH 16/25] JAVA-3570: Keep spring-cloud-zuul on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-zuul/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud/spring-cloud-zuul/pom.xml index b8db1f2fc7..6035ba7e59 100644 --- a/spring-cloud/spring-cloud-zuul/pom.xml +++ b/spring-cloud/spring-cloud-zuul/pom.xml @@ -80,7 +80,7 @@ Hoxton.SR4 - + 2.3.3.RELEASE From a0ec0f3d5ca376ffa6d16eee91ce6361dda67e5b Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 12:03:21 +0100 Subject: [PATCH 17/25] JAVA-3570: Keep spring-cloud-config on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 7fb0c1fd68..5db18a7245 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -34,7 +34,7 @@ Hoxton.SR4 - + 2.3.3.RELEASE From d3770851b0fc8fb4133eb73de66a26659b75304e Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 14 Dec 2020 12:05:56 +0100 Subject: [PATCH 18/25] JAVA-3570: Keep spring-cloud-zookeeper on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-zookeeper/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud/spring-cloud-zookeeper/pom.xml index 244ccbd957..e3241da02c 100644 --- a/spring-cloud/spring-cloud-zookeeper/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/pom.xml @@ -20,6 +20,7 @@ 5.2.7.RELEASE 1.0.3.RELEASE + 2.3.3.RELEASE \ No newline at end of file From fbf57804b87ab53a5096c3f54f2498189e100b2e Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 20:54:29 +0100 Subject: [PATCH 19/25] JAVA-3570: Keep spring-cloud-bus on Spring Boot 2.3.3 [cloud] --- spring-cloud-bus/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index ec56e23ac7..15eed8dcf0 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -35,6 +35,7 @@ Hoxton.SR4 + 2.3.3.RELEASE From 7b0de8a7031b00df90c47983ac34abae2b04cf9a Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 21:00:33 +0100 Subject: [PATCH 20/25] JAVA-3570: Keep spring-cloud-ribbon-client on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-ribbon-client/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml index fa9cee29a2..7bc7b51d51 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml @@ -46,6 +46,7 @@ Hoxton.SR4 + 2.3.3.RELEASE \ No newline at end of file From 080dd971f8c0c878620bd68304005e7582c890db Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 21:03:50 +0100 Subject: [PATCH 21/25] JAVA-3570: Keep spring-cloud-security on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-security/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud/spring-cloud-security/pom.xml index 3a007c8df1..f861b892c0 100644 --- a/spring-cloud/spring-cloud-security/pom.xml +++ b/spring-cloud/spring-cloud-security/pom.xml @@ -21,5 +21,6 @@ + 2.3.3.RELEASE From 26eff5ca447a8f9e3c4f4005b0d8bd1b8d16778c Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 21:14:09 +0100 Subject: [PATCH 22/25] JAVA-3570: Upgrade Spring framework to version compatible with Spring Boot 2.4 in spring-core-2 --- spring-core-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml index edbb351bd0..3f8e84e13d 100644 --- a/spring-core-2/pom.xml +++ b/spring-core-2/pom.xml @@ -198,7 +198,7 @@ com.baeldung.sample.App - 5.2.2.RELEASE + 5.3.0 1.3.2 5.2.5.Final From 3d17425795b3c5f0c3ee4dd2a3459aa16c75bb53 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 21:22:30 +0100 Subject: [PATCH 23/25] JAVA-3570: Register DefaultServlet in spring-social-login --- spring-social-login/src/main/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-social-login/src/main/resources/application.properties b/spring-social-login/src/main/resources/application.properties index 2bd99d8239..22e6acf9e2 100644 --- a/spring-social-login/src/main/resources/application.properties +++ b/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 \ No newline at end of file +spring.thymeleaf.cache=false +server.servlet.register-default-servlet=true \ No newline at end of file From d7cb1a586fe508b44ff021ecf1da04d71de17de2 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Wed, 16 Dec 2020 21:28:39 +0100 Subject: [PATCH 24/25] JAVA-3570: Keep spring-cloud-kubernetes on Spring Boot 2.3.3 [cloud] --- spring-cloud/spring-cloud-kubernetes/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud/spring-cloud-kubernetes/pom.xml index a3669d2d55..44c429d8f5 100644 --- a/spring-cloud/spring-cloud-kubernetes/pom.xml +++ b/spring-cloud/spring-cloud-kubernetes/pom.xml @@ -25,5 +25,6 @@ + 2.3.3.RELEASE \ No newline at end of file From 9a7a3fdac34d633480a40eb84f7cf7511dfbf24c Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Fri, 18 Dec 2020 10:14:23 +0100 Subject: [PATCH 25/25] JAVA-3570: Fix spring-security-oauth2 version in spring-security-oauth2-sso --- spring-security-modules/spring-security-oauth2-sso/pom.xml | 4 ++-- .../src/main/resources/application.yml | 1 + .../spring-security-sso-ui/src/main/resources/application.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-security-modules/spring-security-oauth2-sso/pom.xml b/spring-security-modules/spring-security-oauth2-sso/pom.xml index ed4b1d64ba..a272ba5b50 100644 --- a/spring-security-modules/spring-security-oauth2-sso/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/pom.xml @@ -24,8 +24,8 @@ 3.1.0 - 2.3.3.RELEASE - 2.1.1.RELEASE + 2.4.0.RELEASE + 2.4.0 1.0.1.RELEASE 2.0.0-M2 diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/src/main/resources/application.yml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/src/main/resources/application.yml index 97c8de7839..8cee9f24d5 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/src/main/resources/application.yml +++ b/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 diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/src/main/resources/application.yml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/src/main/resources/application.yml index d1d9ea6ebc..f98dee9429 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/src/main/resources/application.yml +++ b/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