Commit 33a5c31f authored by Andy Wilkinson's avatar Andy Wilkinson

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

See gh-26387
parent 9dd9a2fa
...@@ -7,10 +7,17 @@ description = "Starter for using Spring Security's OAuth2/OpenID Connect client ...@@ -7,10 +7,17 @@ description = "Starter for using Spring Security's OAuth2/OpenID Connect client
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("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") {
api("org.springframework.security:spring-security-core") exclude group: "org.springframework.security", module: "spring-security-crypto"
}
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")
} }
...@@ -6,8 +6,16 @@ description = "Starter for using Spring Security's OAuth2 resource server featur ...@@ -6,8 +6,16 @@ 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") {
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-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"
}
} }
...@@ -7,6 +7,10 @@ description = "Starter for using Spring Security" ...@@ -7,6 +7,10 @@ description = "Starter for using Spring Security"
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:spring-aop") api("org.springframework:spring-aop")
api("org.springframework.security:spring-security-config") api("org.springframework.security:spring-security-config") {
api("org.springframework.security:spring-security-web") exclude group: "org.springframework.security", module: "spring-security-crypto"
}
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