From 259b35bfcb241a35823e37fee0ebae6c68a2fd1c Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Tue, 20 Feb 2024 16:58:11 +0100
Subject: [PATCH] Use simple checkstyle rules since spotless is executed by
 default

---
 pom.xml                       |  6 +++---
 src/site/markdown/index.md.vm | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index e263dd60..3ebceeb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,8 +238,8 @@
     <junit5.version>5.10.2</junit5.version>
     <!-- 10.x requires Java 11 -->
     <checkstyle.version>9.3</checkstyle.version>
-    <!-- configuration for checkstyle to use with spotless -->
-    <checkstyle.spotless.config>config/maven_checks_nocodestyle.xml</checkstyle.spotless.config>
+    <!-- by default use simple configuration for checkstyle rules to use with spotless -->
+    <checkstyle.config.location>config/maven_checks_nocodestyle.xml</checkstyle.config.location>
 
     <invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures>
   </properties>
@@ -300,7 +300,7 @@
               <testSourceDirectory>src/test/java</testSourceDirectory>
             </testSourceDirectories>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <configLocation>config/maven_checks.xml</configLocation>
+            <configLocation>${checkstyle.config.location}</configLocation>
             <!-- by default don't check headers -->
             <headerLocation>mojohaus/config/checkstyle/empty-header.txt</headerLocation>
           </configuration>
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 91934d5f..f63dc02c 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -71,19 +71,6 @@ Checkstyle can be enabled by adding to build/plugins`:
 </plugin>
 ```
 
-When you want to use `checkstyle` together with `spotless`, please add:
-
-```xml
-<plugin>
-   <groupId>org.apache.maven.plugins</groupId>
-   <artifactId>maven-checkstyle-plugin</artifactId>
-   <configuration>
-      <configLocation>${checkstyle.spotless.config}</configLocation>
-   </configuration>
-</plugin>
-```
-
-
 Big code reformat
 -----------------