Make maven and gradle share checkstyle configuration

spring-projects · Feb 14, 2024 · 6522ab6 · 6522ab6
1 parent 531c3e0
commit 6522ab6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,13 @@ tasks.named('test') {
 }
 
 checkstyle {
-  configFile file("${project.rootDir}/src/checkstyle/nohttp-checkstyle.xml")
+  configDirectory = project.file('src/checkstyle')
+  configFile = file('src/checkstyle/nohttp-checkstyle.xml')
+}
+
+checkstyleNohttp {
+  configDirectory = project.file('src/checkstyle')
+  configFile = file('src/checkstyle/nohttp-checkstyle.xml')
 }
 
 tasks.named("formatMain").configure { dependsOn("checkstyleMain") }

diff --git a/config/nohttp/suppressions.xml b/config/nohttp/suppressions.xml
diff --git a/pom.xml b/pom.xml
@@ -198,10 +198,12 @@
             <phase>validate</phase>
             <configuration>
               <configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
-              <suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
               <sourceDirectories>${basedir}</sourceDirectories>
               <includes>**/*</includes>
               <excludes>**/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class</excludes>
+              <propertyExpansion>
+                config_loc=${basedir}/src/checkstyle/
+              </propertyExpansion>
             </configuration>
             <goals>
               <goal>check</goal>

diff --git a/src/checkstyle/nohttp-checkstyle.xml b/src/checkstyle/nohttp-checkstyle.xml
@@ -4,4 +4,7 @@
 		"https://checkstyle.org/dtds/configuration_1_2.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
 	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
+	<module name="SuppressionFilter">
+		<property name="file" value="${config_loc}/nohttp-checkstyle-suppressions.xml"/>
+	</module>
 </module>