Explorar o código

saml2 Projects Are Not Using Formatter

To continue to make progress on moving projects over to a local
idp, Spring Java Format is disabled. This will allow for that
investigation to happen in parallel.

Issue gh-335
Josh Cummings hai 9 meses
pai
achega
ecec3f9c11

+ 8 - 0
build.gradle

@@ -1,3 +1,5 @@
+import io.spring.javaformat.gradle.tasks.Format
+
 plugins {
 	id "checkstyle"
 	id "io.spring.javaformat" version "0.0.42"
@@ -49,6 +51,12 @@ allprojects {
 	tasks.matching { it.name == "checkstyleAotTest" }.all { task ->
 		task.enabled = false
 	}
+
+	tasks.withType(Format).tap {
+		configureEach {
+			it.enabled = !it.identityPath.toString().contains("saml2")
+		}
+	}
 }
 
 if (hasProperty('buildScan')) {

+ 0 - 6
servlet/spring-boot/java/saml2/custom-urls/build.gradle

@@ -15,12 +15,6 @@ repositories {
 sourceSets.main.java.srcDirs += "$projectDir/../identity-provider/src/main/java"
 sourceSets.main.resources.srcDirs += "$projectDir/../identity-provider/src/main/resources"
 
-if (plugins.hasPlugin("io.spring.javaformat")) {
-	tasks.formatMain {
-		dependsOn(":servlet:spring-boot:java:saml2:identity-provider:formatMain")
-	}
-}
-
 dependencies {
 	constraints {
 		implementation "org.opensaml:opensaml-saml-api:5.1.3"

+ 0 - 6
servlet/spring-boot/java/saml2/login/build.gradle

@@ -15,12 +15,6 @@ repositories {
 sourceSets.main.java.srcDirs += "$projectDir/../identity-provider/src/main/java"
 sourceSets.main.resources.srcDirs += "$projectDir/../identity-provider/src/main/resources"
 
-if (plugins.hasPlugin("io.spring.javaformat")) {
-	tasks.formatMain {
-		dependsOn(":servlet:spring-boot:java:saml2:identity-provider:formatMain")
-	}
-}
-
 dependencies {
 	constraints {
 		implementation "org.opensaml:opensaml-saml-api:5.1.3"