Skip to content

Commit ecec3f9

Browse files
committed
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
1 parent 8eb0646 commit ecec3f9

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import io.spring.javaformat.gradle.tasks.Format
2+
13
plugins {
24
id "checkstyle"
35
id "io.spring.javaformat" version "0.0.42"
@@ -49,6 +51,12 @@ allprojects {
4951
tasks.matching { it.name == "checkstyleAotTest" }.all { task ->
5052
task.enabled = false
5153
}
54+
55+
tasks.withType(Format).tap {
56+
configureEach {
57+
it.enabled = !it.identityPath.toString().contains("saml2")
58+
}
59+
}
5260
}
5361

5462
if (hasProperty('buildScan')) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ repositories {
1515
sourceSets.main.java.srcDirs += "$projectDir/../identity-provider/src/main/java"
1616
sourceSets.main.resources.srcDirs += "$projectDir/../identity-provider/src/main/resources"
1717

18-
if (plugins.hasPlugin("io.spring.javaformat")) {
19-
tasks.formatMain {
20-
dependsOn(":servlet:spring-boot:java:saml2:identity-provider:formatMain")
21-
}
22-
}
23-
2418
dependencies {
2519
constraints {
2620
implementation "org.opensaml:opensaml-saml-api:5.1.3"

servlet/spring-boot/java/saml2/login/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ repositories {
1515
sourceSets.main.java.srcDirs += "$projectDir/../identity-provider/src/main/java"
1616
sourceSets.main.resources.srcDirs += "$projectDir/../identity-provider/src/main/resources"
1717

18-
if (plugins.hasPlugin("io.spring.javaformat")) {
19-
tasks.formatMain {
20-
dependsOn(":servlet:spring-boot:java:saml2:identity-provider:formatMain")
21-
}
22-
}
23-
2418
dependencies {
2519
constraints {
2620
implementation "org.opensaml:opensaml-saml-api:5.1.3"

0 commit comments

Comments
 (0)