This is an automated email from the ASF dual-hosted git repository.
petrov-mg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new dfadea42e00 IGNITE-28599 Improved check style plugin configuration to
use placeholder for suppression file (#13071)
dfadea42e00 is described below
commit dfadea42e006dbca60b099a34aaec13296f481ed
Author: Mikhail Petrov <[email protected]>
AuthorDate: Fri Apr 24 11:35:32 2026 +0300
IGNITE-28599 Improved check style plugin configuration to use placeholder
for suppression file (#13071)
---
checkstyle/checkstyle-suppressions.xml | 7 +++++--
checkstyle/checkstyle-xpath-suppressions.xml | 26 --------------------------
checkstyle/checkstyle.xml | 4 ++--
parent/pom.xml | 2 ++
4 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/checkstyle/checkstyle-suppressions.xml
b/checkstyle/checkstyle-suppressions.xml
index a45d4f12af9..3e8a741c925 100644
--- a/checkstyle/checkstyle-suppressions.xml
+++ b/checkstyle/checkstyle-suppressions.xml
@@ -18,8 +18,8 @@
-->
<!DOCTYPE suppressions PUBLIC
- "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
- "https://checkstyle.org/dtds/suppressions_1_2.dtd";>
+ "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration
1.2//EN"
+ "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd";>
<suppressions>
<suppress
checks="RightCurly|LeftCurly|EmptyLineSeparator|MethodParamPad|SingleSpaceSeparator"
files="BCrypt\.java|ConcurrentLinkedDeque8\.java"/>
@@ -68,4 +68,7 @@
<suppress
checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
files="DumpReader\.java|CacheLoadOnlyStoreAdapter\.java"/>
+
+ <suppress-xpath checks="AnnotationOnSameLine"
+ query="//ANNOTATION[.//IDENT[not(@text='Override')]]"/>
</suppressions>
diff --git a/checkstyle/checkstyle-xpath-suppressions.xml
b/checkstyle/checkstyle-xpath-suppressions.xml
deleted file mode 100644
index 2ab024fbe90..00000000000
--- a/checkstyle/checkstyle-xpath-suppressions.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE suppressions PUBLIC
- "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration
1.2//EN"
- "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd";>
-<suppressions>
- <suppress-xpath checks="AnnotationOnSameLine"
- query="//ANNOTATION[.//IDENT[not(@text='Override')]]"/>
-</suppressions>
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index dec1a2958b7..3b248ed7919 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -26,7 +26,7 @@
<!-- Suppressions. See:
https://checkstyle.sourceforge.io/filters/suppressionfilter.html -->
<module name="SuppressionFilter">
- <property name="file" value="checkstyle/checkstyle-suppressions.xml"/>
+ <property name="file" value="${checkstyle.suppressions.file}"/>
</module>
<!-- Whitespaces Checks. See:
http://checkstyle.sourceforge.net/config_whitespace.html -->
@@ -46,7 +46,7 @@
<module name="TreeWalker">
<!-- Suppressions. See:
https://checkstyle.sourceforge.io/filters/suppressionxpathfilter.html -->
<module name="SuppressionXpathFilter">
- <property name="file"
value="checkstyle/checkstyle-xpath-suppressions.xml"/>
+ <property name="file" value="${checkstyle.suppressions.file}"/>
</module>
<!-- Coding Checks. See:
https://checkstyle.sourceforge.io/config_coding.html -->
diff --git a/parent/pom.xml b/parent/pom.xml
index b6d05a3d1eb..bba4e3ac078 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,6 +240,8 @@
<outputFile>${project.build.directory}/checkstyle-result.xml</outputFile>
<!-- This configuration checkstyle files will be
obtained from the 'ignite-checkstyle' resources. -->
<configLocation>checkstyle/checkstyle.xml</configLocation>
+
<suppressionsLocation>checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>**/generated/**/*</excludes>
</configuration>
