Commit 50441376 authored by Stephane Nicoll's avatar Stephane Nicoll

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

Closes gh-26588
parent c67c09df
...@@ -8,17 +8,11 @@ dependencies { ...@@ -8,17 +8,11 @@ dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("com.sun.mail:jakarta.mail") api("com.sun.mail:jakarta.mail")
api("org.springframework.security:spring-security-config") { 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" exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
} }
api("org.springframework.security:spring-security-core") { api("org.springframework.security:spring-security-core")
exclude group: "org.springframework.security", module: "spring-security-crypto"
}
api("org.springframework.security:spring-security-oauth2-client") { api("org.springframework.security:spring-security-oauth2-client") {
exclude group: "com.sun.mail", module: "javax.mail" 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")
} }
...@@ -7,16 +7,9 @@ description = "Starter for using Spring Security's OAuth2 resource server featur ...@@ -7,16 +7,9 @@ description = "Starter for using Spring Security's OAuth2 resource server featur
dependencies { dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.springframework.security:spring-security-config") { 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" exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
} }
api("org.springframework.security:spring-security-core") { 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")
} api("org.springframework.security:spring-security-oauth2-jose")
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"
}
} }
...@@ -8,10 +8,7 @@ dependencies { ...@@ -8,10 +8,7 @@ dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.springframework:spring-aop") api("org.springframework:spring-aop")
api("org.springframework.security:spring-security-config") { 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" exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
} }
api("org.springframework.security:spring-security-web") { api("org.springframework.security:spring-security-web")
exclude group: "org.springframework.security", module: "spring-security-crypto"
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment