Skip to content

Commit 3095b57

Browse files
committed
Issue #167: upgrade to checkstyle 8.15
1 parent f7f2a1d commit 3095b57

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ This plugin provides coding rules from [Checkstyle](http://checkstyle.sourceforg
1818

1919
Checkstyle Plugin|Sonar|Checkstyle|Jdk
2020
-----------------|-----|----------|---
21+
4.15|5.6.6|8.15|1.8
2122
4.14|5.6.6|8.14|1.8
2223
4.13|5.6.6|8.13|1.8
2324
4.12|5.6.6|8.12|1.8

checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.
255255
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.param.allowMissingParamTags=whether to ignore errors when a class has type parameters but does not have matching param tags in the javadoc. Default is false.
256256
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.param.allowUnknownTags=whether to ignore errors when a Javadoc tag is not recognised. Default is false.
257257
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.param.versionFormat=pattern for @version tag
258+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.param.allowedAnnotations=List of annotations that allow missed documentation
258259
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck.name=Final Parameters
259260
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck.param.tokens=blocks to check
260261
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck.param.ignorePrimitiveTypes=to ignore primitive types as params

checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,8 @@
704704
<param key="validateAbstractClassNames" type="BOOLEAN">
705705
<defaultValue>false</defaultValue>
706706
</param>
707-
<param key="tokens" type="s[ANNOTATION_FIELD_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF]">
708-
<defaultValue>ANNOTATION_FIELD_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF</defaultValue>
707+
<param key="tokens" type="s[ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF]">
708+
<defaultValue>ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF</defaultValue>
709709
</param>
710710
<param key="illegalClassNames" type="s{}">
711711
<defaultValue>"java.util.HashSet,java.util.HashMap,java.util.LinkedHashMap,java.util.LinkedHashSet,java.util.TreeSet,java.util.TreeMap"</defaultValue>
@@ -914,6 +914,9 @@
914914
<param key="tokens" type="s[INTERFACE_DEF,CLASS_DEF,ENUM_DEF,ANNOTATION_DEF]">
915915
<defaultValue>INTERFACE_DEF,CLASS_DEF,ENUM_DEF,ANNOTATION_DEF</defaultValue>
916916
</param>
917+
<param key="allowedAnnotations" type="STRING">
918+
<defaultValue>Generated</defaultValue>
919+
</param>
917920
<status>READY</status>
918921
</rule>
919922

@@ -1421,7 +1424,7 @@
14211424
<param key="shouldStartLine" type="BOOLEAN">
14221425
<defaultValue>true</defaultValue>
14231426
</param>
1424-
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT,LAMBDA]">
1427+
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT]">
14251428
<defaultValue>LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE</defaultValue>
14261429
</param>
14271430
<status>READY</status>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</ciManagement>
8686

8787
<properties>
88-
<checkstyle.version>8.14</checkstyle.version>
88+
<checkstyle.version>8.15</checkstyle.version>
8989
<sonar.version>5.6.6</sonar.version>
9090
<sonar-java.version>3.7</sonar-java.version>
9191
<java.version>1.8</java.version>

0 commit comments

Comments
 (0)