Upgrade to OpenSAML 5
Remove OpenSAML 4 build overrides and add Shibboleth Releases maven repository so we can build against OpenSAML 5. Closes gh-46851
This commit is contained in:
parent
a6d4458cad
commit
11c5a8c404
|
@ -32,6 +32,14 @@ subprojects {
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
name "Shibboleth Releases"
|
||||||
|
url "https://build.shibboleth.net/nexus/content/repositories/releases"
|
||||||
|
content {
|
||||||
|
includeGroup "org.opensaml"
|
||||||
|
includeGroup "net.shibboleth"
|
||||||
|
}
|
||||||
|
}
|
||||||
spring.mavenRepositories()
|
spring.mavenRepositories()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,6 @@ plugins {
|
||||||
|
|
||||||
description = "Spring Boot Security SAML2"
|
description = "Spring Boot Security SAML2"
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.eachDependency {
|
|
||||||
if (it.requested.group == 'org.opensaml') {
|
|
||||||
it.useVersion '4.0.1'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":core:spring-boot"))
|
api(project(":core:spring-boot"))
|
||||||
api("org.springframework.security:spring-security-saml2-service-provider")
|
api("org.springframework.security:spring-security-saml2-service-provider")
|
||||||
|
|
|
@ -24,14 +24,6 @@ plugins {
|
||||||
|
|
||||||
description = "Spring Boot Security"
|
description = "Spring Boot Security"
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.eachDependency {
|
|
||||||
if (it.requested.group == 'org.opensaml') {
|
|
||||||
it.useVersion '4.0.1'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":core:spring-boot"))
|
api(project(":core:spring-boot"))
|
||||||
api("org.springframework.security:spring-security-config")
|
api("org.springframework.security:spring-security-config")
|
||||||
|
|
|
@ -24,19 +24,11 @@ plugins {
|
||||||
|
|
||||||
description = "Spring Boot Test AutoConfigure"
|
description = "Spring Boot Test AutoConfigure"
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.eachDependency {
|
|
||||||
if (it.requested.group == 'org.opensaml') {
|
|
||||||
it.useVersion '4.0.1'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":core:spring-boot"))
|
api(project(":core:spring-boot"))
|
||||||
api(project(":core:spring-boot-autoconfigure"))
|
api(project(":core:spring-boot-autoconfigure"))
|
||||||
api(project(":core:spring-boot-test"))
|
api(project(":core:spring-boot-test"))
|
||||||
|
|
||||||
compileOnly("org.mockito:mockito-core")
|
compileOnly("org.mockito:mockito-core")
|
||||||
|
|
||||||
optional(project(":module:spring-boot-cache"))
|
optional(project(":module:spring-boot-cache"))
|
||||||
|
|
|
@ -20,14 +20,6 @@ plugins {
|
||||||
|
|
||||||
description = "Spring Boot SAML 2 service provider smoke test"
|
description = "Spring Boot SAML 2 service provider smoke test"
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.eachDependency {
|
|
||||||
if (it.requested.group == 'org.opensaml') {
|
|
||||||
it.useVersion '4.0.1'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":starter:spring-boot-starter-security-saml2"))
|
implementation(project(":starter:spring-boot-starter-security-saml2"))
|
||||||
implementation(project(":starter:spring-boot-starter-webmvc"))
|
implementation(project(":starter:spring-boot-starter-webmvc"))
|
||||||
|
|
|
@ -20,14 +20,6 @@ plugins {
|
||||||
|
|
||||||
description = "Starter for using Spring Security with SAML2"
|
description = "Starter for using Spring Security with SAML2"
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.eachDependency {
|
|
||||||
if (it.requested.group == 'org.opensaml') {
|
|
||||||
it.useVersion '4.0.1'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":starter:spring-boot-starter"))
|
api(project(":starter:spring-boot-starter"))
|
||||||
api(project(":starter:spring-boot-starter-security"))
|
api(project(":starter:spring-boot-starter-security"))
|
||||||
|
|
Loading…
Reference in New Issue