Skip to content

Commit

Permalink
Try Checkstyle 10.x
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-o committed Oct 26, 2024
1 parent 3c115ff commit 4c35c8b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0</checkstyleVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<doxiaVersion>2.0.0</doxiaVersion>
<doxiaSitetoolsVersion>2.0.0</doxiaSitetoolsVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MCHECKSTYLE-268/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
def buildLog = new File( basedir, 'build.log' )

assert buildLog.text.contains( "You have 3 Checkstyle violations." )
assert buildLog.text.contains( "You have 4 Checkstyle violations." )
16 changes: 7 additions & 9 deletions src/it/MCHECKSTYLE-357-with-header-override/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand All @@ -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" />

Expand Down Expand Up @@ -133,11 +136,6 @@

<!-- Naming -->
<module name="ConstantName" />

<!-- Sizes -->
<module name="LineLength">
<property name="max" value="120" />
</module>
</module>

<module name="RegexpSingleline">
Expand Down Expand Up @@ -170,7 +168,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.15</version>
<version>@checkstyleVersion@</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion src/site/apt/examples/inline-checker-config.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/site/apt/examples/upgrading-checkstyle.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -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}}:
Expand Down

0 comments on commit 4c35c8b

Please sign in to comment.