Pull #12761: Define variable for non-main-files-suppressions file

checkstyle · Feb 20, 2023 · 40f4092 · 40f4092
1 parent f5b3e7e
commit 40f4092
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.ci/validation.sh b/.ci/validation.sh
@@ -693,7 +693,8 @@ no-error-sevntu-checks)
   mvn -e --no-transfer-progress -Pno-validations verify  -Dcheckstyle.ant.skip=false \
      -Dcheckstyle.version="${CS_POM_VERSION}" \
      -Dcheckstyle.configLocation=../../../config/checkstyle_checks.xml \
-     -Dcheckstyle.nonMain.configLocation=../../../config/checkstyle_non_main_files_checks.xml
+     -Dcheckstyle.nonMain.configLocation=../../../config/checkstyle_non_main_files_checks.xml \
+     -Dcheckstyle.non-main-files-suppressions.file=config/checkstyle_non_main_files_suppressions.xml
   cd ../../
   removeFolderWithProtectedFiles sevntu.checkstyle
   ;;

diff --git a/config/ant-phase-verify.xml b/config/ant-phase-verify.xml
@@ -67,6 +67,8 @@
                 failureProperty="checkstyle.failure.property"
                 executeIgnoredModules="true"
                 >
+      <property key="checkstyle.non-main-files-suppressions.file"
+                file="config/checkstyle_non_main_files_suppressions.xml"/>
       <path>
         <fileset dir="${basedir}" includes="**/*">
           <exclude name=".git/**/*"/>

diff --git a/config/checkstyle_non_main_files_checks.xml b/config/checkstyle_non_main_files_checks.xml
@@ -11,7 +11,7 @@
   <!-- Suppressions for resources -->
   <module name="SuppressionFilter">
     <property name="file"
-             value="config/checkstyle_non_main_files_suppressions.xml"/>
+             value="${checkstyle.non-main-files-suppressions.file}"/>
   </module>
   <!-- Miscellaneous -->
   <module name="NewlineAtEndOfFile" />