Skip to content

Commit

Permalink
saml2 Projects Are Not Using Formatter
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jzheaux committed Nov 5, 2024
1 parent 8eb0646 commit ecec3f9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import io.spring.javaformat.gradle.tasks.Format

plugins {
id "checkstyle"
id "io.spring.javaformat" version "0.0.42"
Expand Down Expand Up @@ -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')) {
Expand Down
6 changes: 0 additions & 6 deletions servlet/spring-boot/java/saml2/custom-urls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions servlet/spring-boot/java/saml2/login/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ecec3f9

Please sign in to comment.