From 7b490f003c4830a2981d20310dfbb64910a971f5 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 1 Jun 2021 17:45:14 +0200
Subject: [PATCH] Avoid dependency on Kotlin when depending on
 spring-security-config

Closes gh-26727
---
 .../spring-boot-starter-oauth2-client/build.gradle               | 1 +
 .../spring-boot-starter-oauth2-resource-server/build.gradle      | 1 +
 .../spring-boot-starter-security/build.gradle                    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle
index 15772c590b9e..8aeed98c7957 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 	api("com.sun.mail:jakarta.mail")
 	api("org.springframework.security:spring-security-config") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"
+        exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
 	}
 	api("org.springframework.security:spring-security-core") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle
index 1fcc9b8b60d7..34b09afa5741 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle
@@ -8,6 +8,7 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("org.springframework.security:spring-security-config") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"
+        exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
 	}
 	api("org.springframework.security:spring-security-core") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle
index 2025b640188f..eedd49405b80 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 	api("org.springframework:spring-aop")
 	api("org.springframework.security:spring-security-config") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"
+        exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
 	}
 	api("org.springframework.security:spring-security-web") {
 		exclude group: "org.springframework.security", module: "spring-security-crypto"