Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid duplicate crypto classes when depending on spring-security-core"

Browse Source 
Closes gh-26588
This commit is contained in:
Stephane Nicoll
2021-06-21 21:26:11 +02:00
parent c67c09df32
commit 5044137658
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle
View File

@@ -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")
}

13
spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle
View File

@@ -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")
}

5
spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle
View File

@@ -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")
}