From 9a7a3fdac34d633480a40eb84f7cf7511dfbf24c Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 18 Dec 2020 10:14:23 +0100
Subject: [PATCH] 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 @@
 
     <properties>
         <rest-assured.version>3.1.0</rest-assured.version>
-        <oauth.version>2.3.3.RELEASE</oauth.version>
-        <oauth-auto.version>2.1.1.RELEASE</oauth-auto.version>
+        <oauth.version>2.4.0.RELEASE</oauth.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>
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