Browse Source

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

See gh-26387
pull/26591/head
Andy Wilkinson 5 years ago
parent
commit
33a5c31fe3
  1. 13
      spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle
  2. 16
      spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle
  3. 8
      spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle

13
spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle

@ -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 {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("com.sun.mail:jakarta.mail")
api("org.springframework.security:spring-security-config")
api("org.springframework.security:spring-security-core")
api("org.springframework.security:spring-security-config") {
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") {
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")
}

16
spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle

@ -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 {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
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")
api("org.springframework.security:spring-security-config") {
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-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
spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle

@ -7,6 +7,10 @@ description = "Starter for using Spring Security" @@ -7,6 +7,10 @@ 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")
api("org.springframework.security:spring-security-web")
api("org.springframework.security:spring-security-config") {
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"
}
}

Loading…
Cancel
Save