Skip to content

Commit 11c5a8c

Browse files
committed
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
1 parent a6d4458 commit 11c5a8c

File tree

6 files changed

+9
-41
lines changed

6 files changed

+9
-41
lines changed

build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ subprojects {
3232

3333
repositories {
3434
mavenCentral()
35+
maven {
36+
name "Shibboleth Releases"
37+
url "https://build.shibboleth.net/nexus/content/repositories/releases"
38+
content {
39+
includeGroup "org.opensaml"
40+
includeGroup "net.shibboleth"
41+
}
42+
}
3543
spring.mavenRepositories()
3644
}
3745

module/spring-boot-security-saml2/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ plugins {
2424

2525
description = "Spring Boot Security SAML2"
2626

27-
configurations.all {
28-
resolutionStrategy.eachDependency {
29-
if (it.requested.group == 'org.opensaml') {
30-
it.useVersion '4.0.1'
31-
}
32-
}
33-
}
34-
3527
dependencies {
3628
api(project(":core:spring-boot"))
3729
api("org.springframework.security:spring-security-saml2-service-provider")

module/spring-boot-security/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ plugins {
2424

2525
description = "Spring Boot Security"
2626

27-
configurations.all {
28-
resolutionStrategy.eachDependency {
29-
if (it.requested.group == 'org.opensaml') {
30-
it.useVersion '4.0.1'
31-
}
32-
}
33-
}
34-
3527
dependencies {
3628
api(project(":core:spring-boot"))
3729
api("org.springframework.security:spring-security-config")

module/spring-boot-test-autoconfigure/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,11 @@ plugins {
2424

2525
description = "Spring Boot Test AutoConfigure"
2626

27-
configurations.all {
28-
resolutionStrategy.eachDependency {
29-
if (it.requested.group == 'org.opensaml') {
30-
it.useVersion '4.0.1'
31-
}
32-
}
33-
}
34-
3527
dependencies {
3628
api(project(":core:spring-boot"))
3729
api(project(":core:spring-boot-autoconfigure"))
3830
api(project(":core:spring-boot-test"))
39-
31+
4032
compileOnly("org.mockito:mockito-core")
4133

4234
optional(project(":module:spring-boot-cache"))

smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ plugins {
2020

2121
description = "Spring Boot SAML 2 service provider smoke test"
2222

23-
configurations.all {
24-
resolutionStrategy.eachDependency {
25-
if (it.requested.group == 'org.opensaml') {
26-
it.useVersion '4.0.1'
27-
}
28-
}
29-
}
30-
3123
dependencies {
3224
implementation(project(":starter:spring-boot-starter-security-saml2"))
3325
implementation(project(":starter:spring-boot-starter-webmvc"))

starter/spring-boot-starter-security-saml2/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ plugins {
2020

2121
description = "Starter for using Spring Security with SAML2"
2222

23-
configurations.all {
24-
resolutionStrategy.eachDependency {
25-
if (it.requested.group == 'org.opensaml') {
26-
it.useVersion '4.0.1'
27-
}
28-
}
29-
}
30-
3123
dependencies {
3224
api(project(":starter:spring-boot-starter"))
3325
api(project(":starter:spring-boot-starter-security"))

0 commit comments

Comments
 (0)