opensaml fixes

build.gradle

@@ -4,6 +4,7 @@ buildscript {
 		classpath 'io.spring.nohttp:nohttp-gradle:0.0.8'
 		classpath "io.freefair.gradle:aspectj-plugin:5.3.3.3"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+		classpath "com.netflix.nebula:nebula-project-plugin:8.0.0"
 	}
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-snapshot' }

config/spring-security-config.gradle

@@ -19,8 +19,7 @@ dependencies {
 
 	optional project(':spring-security-ldap')
 	optional project(':spring-security-messaging')
-	optional project(':saml2-service-provider-opensaml3')
+	optional project(':spring-security-saml2-service-provider')
-	optional project(':saml2-service-provider-opensaml4')
 	optional project(':spring-security-oauth2-client')
 	optional project(':spring-security-oauth2-jose')
 	optional project(':spring-security-oauth2-resource-server')
@@ -48,8 +47,7 @@ dependencies {
 	testImplementation project(path : ':spring-security-ldap', configuration : 'tests')
 	testImplementation project(path : ':spring-security-oauth2-client', configuration : 'tests')
 	testImplementation project(path : ':spring-security-oauth2-resource-server', configuration : 'tests')
-	testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
+	testImplementation project(path : ':spring-security-saml2-service-provider', configuration : 'tests')
-	testImplementation project(path : ':saml2-service-provider-opensaml4', configuration : 'tests')
 	testImplementation project(path : ':spring-security-web', configuration : 'tests')
 	testImplementation apachedsDependencies
 	testImplementation powerMock2Dependencies

saml2/saml2-service-provider/core/saml2-service-provider-core.gradle

@@ -1,62 +0,0 @@
-buildscript {
-	repositories {
-		maven { url 'https://repo.spring.io/plugins-release' }
-	}
-	dependencies {
-		classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
-	}
-}
-
-plugins {
-	id 'java'
-	id 'java-library'
-	id 'io.spring.convention.repository'
-	id 'io.spring.convention.management-configuration'
-	id 'io.spring.convention.dependency-set'
-	id 'io.spring.convention.checkstyle'
-	id 'io.spring.convention.tests-configuration'
-	id 'io.spring.convention.integration-test'
-	id 'propdeps'
-}
-
-configurations {
-	classesOnlyElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-	sourceElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-	javadocElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-}
-
-artifacts {
-	classesOnlyElements(compileJava.destinationDir)
-	sourceSets.main.allSource.srcDirs.forEach({ dir ->
-		sourceElements(dir)
-	})
-	javadocElements(javadoc.destinationDir)
-}
-
-repositories {
-	maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
-}
-
-dependencies {
-	management platform(project(":spring-security-dependencies"))
-
-	api project(':spring-security-core')
-	api project(':spring-security-web')
-
-	provided("org.opensaml:opensaml-core")
-	provided("org.opensaml:opensaml-saml-api")
-	provided("org.opensaml:opensaml-saml-impl")
-
-	provided 'javax.servlet:javax.servlet-api'
-
-	testImplementation 'com.squareup.okhttp3:mockwebserver'
-}

saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle

@@ -1,61 +0,0 @@
-buildscript {
-	repositories {
-		maven { url 'https://repo.spring.io/plugins-release' }
-	}
-	dependencies {
-		classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
-	}
-}
-
-plugins {
-	id 'java'
-	id 'java-library'
-	id 'io.spring.convention.repository'
-	id 'io.spring.convention.management-configuration'
-	id 'io.spring.convention.dependency-set'
-	id 'io.spring.convention.checkstyle'
-	id 'io.spring.convention.tests-configuration'
-	id 'io.spring.convention.integration-test'
-	id 'propdeps'
-}
-
-configurations {
-	classesOnlyElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-	sourceElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-	javadocElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-}
-
-artifacts {
-	classesOnlyElements(compileJava.destinationDir)
-	sourceSets.main.allSource.srcDirs.forEach({ dir ->
-		sourceElements(dir)
-	})
-	javadocElements(javadoc.destinationDir)
-}
-
-repositories {
-	maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
-}
-
-dependencies {
-	management platform(project(":spring-security-dependencies"))
-	api project(':saml2-service-provider-core')
-
-	api("org.opensaml:opensaml-core")
-	api("org.opensaml:opensaml-saml-api")
-	api("org.opensaml:opensaml-saml-impl")
-
-	provided 'javax.servlet:javax.servlet-api'
-
-	testImplementation 'com.squareup.okhttp3:mockwebserver'
-	testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
-}

saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle

@@ -1,72 +0,0 @@
-buildscript {
-	repositories {
-		maven { url 'https://repo.spring.io/plugins-release' }
-	}
-	dependencies {
-		classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
-	}
-}
-
-plugins {
-	id 'java'
-	id 'java-library'
-	id 'io.spring.convention.repository'
-	id 'io.spring.convention.management-configuration'
-	id 'io.spring.convention.dependency-set'
-	id 'io.spring.convention.checkstyle'
-	id 'io.spring.convention.tests-configuration'
-	id 'io.spring.convention.integration-test'
-	id 'propdeps'
-}
-
-configurations {
-	classesOnlyElements {
-		canBeConsumed = true
-		canBeResolved = false
-		attributes {
-			attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 11)
-		}
-	}
-	sourceElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-	javadocElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-}
-
-artifacts {
-	classesOnlyElements(compileJava.destinationDir)
-	sourceSets.main.allSource.srcDirs.forEach({ dir ->
-		sourceElements(dir)
-	})
-	javadocElements(javadoc.destinationDir)
-}
-
-sourceCompatibility = '11'
-
-repositories {
-	maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
-}
-
-dependencies {
-	management platform(project(":spring-security-dependencies"))
-	constraints {
-		management("org.opensaml:opensaml-core:4.1.0")
-		management("org.opensaml:opensaml-saml-api:4.1.0")
-		management("org.opensaml:opensaml-saml-impl:4.1.0")
-	}
-
-	api project(':saml2-service-provider-core')
-
-	api("org.opensaml:opensaml-core")
-	api("org.opensaml:opensaml-saml-api")
-	api("org.opensaml:opensaml-saml-impl")
-
-	provided 'javax.servlet:javax.servlet-api'
-
-	testImplementation 'com.squareup.okhttp3:mockwebserver'
-	testImplementation project(path : ':saml2-service-provider-core', configuration : 'tests')
-}

saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle

@@ -1,88 +1,71 @@
 apply plugin: 'io.spring.convention.spring-module'
+apply plugin: 'nebula.facet'
 
-tasks.forEach({ task ->
+facets {
-	if (project(":saml2-service-provider-core").tasks.findByName(task.name)) {
+	opensaml3Main {
-		task.dependsOn(project(":saml2-service-provider-core").tasks[task.name])
+		parentSourceSet = 'main'
 	}
-	if (project(":saml2-service-provider-opensaml3").tasks.findByName(task.name)) {
+	opensaml4Main {
-		task.dependsOn(project(":saml2-service-provider-opensaml3").tasks[task.name])
+		parentSourceSet = 'main'
 	}
-	if (project(":saml2-service-provider-opensaml4").tasks.findByName(task.name)) {
+	opensaml3Test {
-		task.dependsOn(project(":saml2-service-provider-opensaml4").tasks[task.name])
+		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 {
-	coreSource {
+	opensaml3TestImplementation.extendsFrom testImplementation
-		canBeConsumed = false
+	opensaml4TestImplementation.extendsFrom testImplementation
-		canBeResolved = true
+}
-	}
+
-	opensaml3Source {
+compileOpensaml4MainJava {
-		canBeConsumed = false
+	sourceCompatibility = '11'
-		canBeResolved = true
+	targetCompatibility = '11'
-	}
-	opensaml4Source {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	coreClasses {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	opensaml3Classes {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	opensaml4Classes {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	coreJavadoc {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	opensaml3Javadoc {
-		canBeConsumed = false
-		canBeResolved = true
-	}
-	opensaml4Javadoc {
-		canBeConsumed = false
-		canBeResolved = true
-	}
 }
 
 dependencies {
 	management platform(project(":spring-security-dependencies"))
 	api project(':spring-security-web')
-	api("org.opensaml:opensaml-core")
+	api "org.opensaml:opensaml-core"
-	api("org.opensaml:opensaml-saml-api")
+	api "org.opensaml:opensaml-saml-api"
-	api("org.opensaml:opensaml-saml-impl")
+	api "org.opensaml:opensaml-saml-impl"
-	coreSource(project(path: ":saml2-service-provider-core", configuration: 'sourceElements'))
+	opensaml4MainCompile "org.opensaml:opensaml-core:4.1.0"
-	opensaml3Source(project(path: ":saml2-service-provider-opensaml3", configuration: 'sourceElements'))
+	opensaml4MainCompile "org.opensaml:opensaml-saml-api:4.1.0"
-	opensaml4Source(project(path: ":saml2-service-provider-opensaml4", configuration: 'sourceElements'))
+	opensaml4MainCompile "org.opensaml:opensaml-saml-impl:4.1.0"
-	coreClasses(project(path: ":saml2-service-provider-core", configuration: 'classesOnlyElements'))
+
-	opensaml3Classes(project(path: ":saml2-service-provider-opensaml3", configuration: 'classesOnlyElements'))
+	provided 'javax.servlet:javax.servlet-api'
-	opensaml4Classes(project(path: ":saml2-service-provider-opensaml4", configuration: 'classesOnlyElements'))
+
-	coreJavadoc(project(path: ":saml2-service-provider-core", configuration: 'javadocElements'))
+	testImplementation 'com.squareup.okhttp3:mockwebserver'
-	opensaml3Javadoc(project(path: ":saml2-service-provider-opensaml3", configuration: 'javadocElements'))
-	opensaml4Javadoc(project(path: ":saml2-service-provider-opensaml4", configuration: 'javadocElements'))
 }
 
-jar {
+project.tasks.matching { t -> t.name == "jar"}.configureEach {
-	from configurations.coreClasses
+	from {
-	from configurations.opensaml3Classes
+		compileOpensaml3MainJava
-	from configurations.opensaml4Classes
+	}
+	from {
+		compileOpensaml4MainJava
+	}
 }
 
-javadocJar {
+project.tasks.matching { t -> t.name == "sourcesJar"}.configureEach {
-	from configurations.coreJavadoc
+	from {
-	from configurations.opensaml3Javadoc
+		sourceSets.opensaml3Main.allSource
-	from configurations.opensaml4Javadoc
+	}
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	from {
-}
+		sourceSets.opensaml4Main.allSource
-
+	}
-sourcesJar {
-	from configurations.coreSource
-	from configurations.opensaml3Source
-	from configurations.opensaml4Source
 }