Remove Deprecated OpenSAML 3 Support
Closes gh-10556
This commit is contained in:
@@ -1,44 +1,4 @@
|
||||
apply plugin: 'io.spring.convention.spring-module'
|
||||
apply plugin: 'nebula.facet'
|
||||
|
||||
facets {
|
||||
opensaml3Main {
|
||||
parentSourceSet = 'main'
|
||||
}
|
||||
opensaml4Main {
|
||||
parentSourceSet = 'main'
|
||||
}
|
||||
opensaml3Test {
|
||||
parentSourceSet = 'opensaml3Main'
|
||||
}
|
||||
opensaml4Test {
|
||||
parentSourceSet = 'opensaml4Main'
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
opensaml3Test {
|
||||
compileClasspath += sourceSets.test.output
|
||||
runtimeClasspath += sourceSets.test.output
|
||||
}
|
||||
opensaml4Test {
|
||||
compileClasspath += sourceSets.test.output
|
||||
runtimeClasspath += sourceSets.test.output
|
||||
}
|
||||
}
|
||||
|
||||
configurations {
|
||||
opensaml3TestImplementation.extendsFrom testImplementation
|
||||
opensaml4TestImplementation.extendsFrom testImplementation
|
||||
opensaml4MainImplementation {
|
||||
canBeConsumed = true
|
||||
}
|
||||
}
|
||||
|
||||
compileOpensaml4MainJava {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
dependencies {
|
||||
management platform(project(":spring-security-dependencies"))
|
||||
@@ -50,13 +10,6 @@ dependencies {
|
||||
api ("org.opensaml:opensaml-saml-impl") {
|
||||
exclude group: 'commons-logging', module: 'commons-logging'
|
||||
}
|
||||
opensaml4MainImplementation "org.opensaml:opensaml-core:4.1.0"
|
||||
opensaml4MainImplementation ("org.opensaml:opensaml-saml-api:4.1.0") {
|
||||
exclude group: 'commons-logging', module: 'commons-logging'
|
||||
}
|
||||
opensaml4MainImplementation ("org.opensaml:opensaml-saml-impl:4.1.0") {
|
||||
exclude group: 'commons-logging', module: 'commons-logging'
|
||||
}
|
||||
|
||||
provided 'jakarta.servlet:jakarta.servlet-api'
|
||||
|
||||
@@ -73,35 +26,3 @@ dependencies {
|
||||
testImplementation "org.mockito:mockito-junit-jupiter"
|
||||
testImplementation "org.springframework:spring-test"
|
||||
}
|
||||
|
||||
project.tasks.matching { t -> t.name == "jar"}.configureEach {
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
from {
|
||||
compileOpensaml3MainJava
|
||||
}
|
||||
from {
|
||||
compileOpensaml4MainJava
|
||||
}
|
||||
}
|
||||
|
||||
project.tasks.matching { t -> t.name == "sourcesJar"}.configureEach {
|
||||
from {
|
||||
sourceSets.opensaml3Main.allSource
|
||||
}
|
||||
from {
|
||||
sourceSets.opensaml4Main.allSource
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
javadoc {
|
||||
source += sourceSets.opensaml3Main.allJava + sourceSets.opensaml4Main.allJava
|
||||
}
|
||||
|
||||
opensaml3Test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
opensaml4Test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user