Skip to content

Commit 55f3ace

Browse files
committed
Issue #353: update to CS 8.40
1 parent 9574598 commit 55f3ace

File tree

5 files changed

+7
-2
lines changed

5 files changed

+7
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
2121

2222
Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
2323
-----------------|---------|---------|----------|---
24+
8.40|7.9 |7.9+|8.40|1.8
2425
8.39|7.9 |7.9+|8.39|1.8
2526
8.38|7.9 |7.9+|8.38|1.8
2627
8.37|7.9 |7.9+|8.37|1.8

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</ciManagement>
9494

9595
<properties>
96-
<checkstyle.version>8.39</checkstyle.version>
96+
<checkstyle.version>8.40</checkstyle.version>
9797
<sonar.version>7.9</sonar.version>
9898
<sonar-java.version>6.0.0.20538</sonar-java.version>
9999
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.OuterTypeNumberChec
3434
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.OuterTypeNumberCheck.param.max=maximum allowable number of outer types. Default is 1.
3535
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck.name=Design For Extension
3636
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck.param.ignoredAnnotations=Annotations which allow the check to skip the method from validation.
37+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck.param.requiredJavadocPhrase=Specify the comment text pattern which qualifies a method as designed for extension. Supports multi-line regex.
3738
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck.name=Illegal Throws
3839
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck.param.illegalClassNames=throw class names to reject
3940
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck.param.ignoredMethodNames=names of methods to ignore. Default is "finalize".

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,9 @@
493493
<param key="ignoredAnnotations" type="s{}">
494494
<defaultValue>Test,Before,After,BeforeClass,AfterClass</defaultValue>
495495
</param>
496+
<param key="requiredJavadocPhrase" type="REGULAR_EXPRESSION">
497+
<defaultValue>.*</defaultValue>
498+
</param>
496499
</rule>
497500

498501
<rule key="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">

src/test/java/org/sonar/plugins/checkstyle/CheckstyleRulesDefinitionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void test() {
8080
// such number should not change during checkstyle version upgrade
8181
assertThat(duplicatedRuleWithTemplate).hasSize(174);
8282
// all new Rules should fall in this group
83-
assertThat(rulesWithDuplicateTemplate).hasSize(8);
83+
assertThat(rulesWithDuplicateTemplate).hasSize(9);
8484

8585
for (RulesDefinition.Rule rule : rules) {
8686
assertThat(rule.key()).isNotNull();

0 commit comments

Comments
 (0)