From 5044137658bc6222bc1e63b502be48dc0f45534f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 21 Jun 2021 21:26:11 +0200 Subject: [PATCH 1/2] Revert "Avoid duplicate crypto classes when depending on spring-security-core" Closes gh-26588 --- .../spring-boot-starter-oauth2-client/build.gradle | 10 ++-------- .../build.gradle | 13 +++---------- .../spring-boot-starter-security/build.gradle | 5 +---- 3 files changed, 6 insertions(+), 22 deletions(-) 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 8aeed98c795..d93ec0437b3 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 @@ -8,17 +8,11 @@ dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) 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" - } + api("org.springframework.security:spring-security-core") api("org.springframework.security:spring-security-oauth2-client") { exclude group: "com.sun.mail", module: "javax.mail" - exclude group: "org.springframework.security", module: "spring-security-crypto" - } - api("org.springframework.security:spring-security-oauth2-jose") { - exclude group: "org.springframework.security", module: "spring-security-crypto" } + api("org.springframework.security:spring-security-oauth2-jose") } 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 34b09afa574..3781f9722c9 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 @@ -7,16 +7,9 @@ description = "Starter for using Spring Security's OAuth2 resource server featur 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" - } - api("org.springframework.security:spring-security-oauth2-resource-server") { - exclude group: "org.springframework.security", module: "spring-security-crypto" - } - api("org.springframework.security:spring-security-oauth2-jose") { - exclude group: "org.springframework.security", module: "spring-security-crypto" - } + api("org.springframework.security:spring-security-core") + api("org.springframework.security:spring-security-oauth2-resource-server") + api("org.springframework.security:spring-security-oauth2-jose") } 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 eedd49405b8..462af403675 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 @@ -8,10 +8,7 @@ dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) 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" - } + api("org.springframework.security:spring-security-web") } From 8668e55631029c90a5c5d52a45bbb14383b53e27 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 21 Jun 2021 21:28:03 +0200 Subject: [PATCH 2/2] Revert "Avoid dependency on Kotlin when depending on spring-security-config" Closes gh-26728 --- .../spring-boot-starter-oauth2-client/build.gradle | 4 +--- .../spring-boot-starter-oauth2-resource-server/build.gradle | 4 +--- .../spring-boot-starter-security/build.gradle | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) 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 d93ec0437b3..3df25780ed6 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 @@ -7,9 +7,7 @@ description = "Starter for using Spring Security's OAuth2/OpenID Connect client dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api("com.sun.mail:jakarta.mail") - api("org.springframework.security:spring-security-config") { - exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8" - } + api("org.springframework.security:spring-security-config") api("org.springframework.security:spring-security-core") api("org.springframework.security:spring-security-oauth2-client") { exclude group: "com.sun.mail", module: "javax.mail" 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 3781f9722c9..a91da01d8d6 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 @@ -6,9 +6,7 @@ description = "Starter for using Spring Security's OAuth2 resource server featur dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.springframework.security:spring-security-config") { - exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8" - } + api("org.springframework.security:spring-security-config") api("org.springframework.security:spring-security-core") api("org.springframework.security:spring-security-oauth2-resource-server") api("org.springframework.security:spring-security-oauth2-jose") 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 462af403675..c6e63f44efa 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 @@ -7,8 +7,6 @@ description = "Starter for using Spring Security" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api("org.springframework:spring-aop") - api("org.springframework.security:spring-security-config") { - exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8" - } + api("org.springframework.security:spring-security-config") api("org.springframework.security:spring-security-web") }