Try Checkstyle 10.x

apache · Jun 7, 2024 · b41e8a7 · b41e8a7
1 parent fad5268
commit b41e8a7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,10 +73,10 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <javaVersion>8</javaVersion>
+    <javaVersion>11</javaVersion>
     <mavenVersion>3.6.3</mavenVersion>
     <resolverVersion>1.4.1</resolverVersion>
-    <checkstyleVersion>9.3</checkstyleVersion>
+    <checkstyleVersion>10.17.0</checkstyleVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <doxiaVersion>2.0.0-M12</doxiaVersion>
     <doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>

diff --git a/src/it/MCHECKSTYLE-357-with-header-override/pom.xml b/src/it/MCHECKSTYLE-357-with-header-override/pom.xml
@@ -44,6 +44,11 @@
                                 <property name="charset" value="UTF-8" />
                                 <property name="severity" value="error" />
 
+                                <!-- Sizes -->
+                                <module name="LineLength">
+                                    <property name="max" value="120" />
+                                </module>
+
                                 <module name="TreeWalker">
                                     <property name="tabWidth" value="3" />
 
@@ -55,9 +60,7 @@
 
                                     <!-- Annotations -->
                                     <module name="AnnotationUseStyle" />
-                                    <module name="MissingDeprecated">
-                                        <property name="skipNoJavadoc" value="true" />
-                                    </module>
+                                    <module name="MissingDeprecated" />
                                     <module name="MissingOverride" />
                                     <module name="PackageAnnotation" />
 
@@ -133,11 +136,6 @@
 
                                     <!-- Naming -->
                                     <module name="ConstantName" />
-
-                                    <!-- Sizes -->
-                                    <module name="LineLength">
-                                        <property name="max" value="120" />
-                                    </module>
                                 </module>
 
                                 <module name="RegexpSingleline">
@@ -170,7 +168,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.15</version>
+                            <version>@checkstyleVersion@</version>
                         </dependency>
                     </dependencies>
                 </plugin>

diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
@@ -31,11 +31,11 @@
 import java.util.Locale;
 import java.util.Map;
 
+import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.DefaultLogger;
 import com.puppycrawl.tools.checkstyle.SarifLogger;
 import com.puppycrawl.tools.checkstyle.XMLLogger;
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;

diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
@@ -33,11 +33,11 @@
 import java.util.List;
 import java.util.Map;
 
+import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.DefaultLogger;
 import com.puppycrawl.tools.checkstyle.SarifLogger;
 import com.puppycrawl.tools.checkstyle.XMLLogger;
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Dependency;

diff --git a/src/site/apt/examples/inline-checker-config.apt.vm b/src/site/apt/examples/inline-checker-config.apt.vm
@@ -151,7 +151,7 @@ Using a different header
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.15</version>
+            <version>${checkstyleVersion}</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/src/site/apt/examples/upgrading-checkstyle.apt.vm b/src/site/apt/examples/upgrading-checkstyle.apt.vm
@@ -28,7 +28,7 @@
 Upgrading Checkstyle at Runtime
 
    Maven Checkstyle plugin comes with a default Checkstyle version: for <<<maven-checkstyle-plugin ${project.version}>>>,
-   Checkstyle  ${checkstyleVersion} is used by default.
+   Checkstyle ${checkstyleVersion} is used by default.
 
    Given Checkstyle generally keeps good compatibility between versions, you can override the version used at runtime to
    benefit from {{{https://checkstyle.org/releasenotes.html}Checkstyle latest bugfixes}}: