diff --git a/build.gradle b/build.gradle index 00847aebf23..ede413a4427 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,12 @@ plugins { id 'org.springframework.boot' version '3.2.0' id 'io.spring.dependency-management' version '1.1.4' id 'org.graalvm.buildtools.native' version '0.9.28' - id 'io.spring.javaformat' version '0.0.40' + id 'io.spring.javaformat' version '0.0.41' + id "io.spring.nohttp" version "0.0.11" } apply plugin: 'java' +apply plugin: 'checkstyle' apply plugin: 'io.spring.javaformat' gradle.startParameter.excludedTaskNames += [ "checkFormatAot", "checkFormatAotTest" ] @@ -43,8 +45,29 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-docker-compose' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:mysql' + checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.41' + checkstyle 'com.puppycrawl.tools:checkstyle:10.12.5' } tasks.named('test') { useJUnitPlatform() } + +checkstyle { + configFile file("${project.rootDir}/src/checkstyle/nohttp-checkstyle.xml") +} + +tasks.named("formatMain").configure { dependsOn("checkstyleMain") } +tasks.named("formatMain").configure { dependsOn("checkstyleNohttp") } + +tasks.named("formatTest").configure { dependsOn("checkstyleTest") } +tasks.named("formatTest").configure { dependsOn("checkstyleNohttp") } + +checkstyleAot.enabled = false +checkstyleAotTest.enabled = false + +checkFormatAot.enabled = false +checkFormatAotTest.enabled = false + +formatAot.enabled = false +formatAotTest.enabled = false diff --git a/config/nohttp/suppressions.xml b/config/nohttp/suppressions.xml new file mode 100644 index 00000000000..8a758b71857 --- /dev/null +++ b/config/nohttp/suppressions.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/checkstyle/nohttp-checkstyle-suppressions.xml b/src/checkstyle/nohttp-checkstyle-suppressions.xml index 7c118a74fdb..8a758b71857 100644 --- a/src/checkstyle/nohttp-checkstyle-suppressions.xml +++ b/src/checkstyle/nohttp-checkstyle-suppressions.xml @@ -6,5 +6,6 @@ +