opensaml fixes

Author: rwinch

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