Skip to content

Commit aeefe0f

Browse files
committed
Issue #367: upgrade to checkstyle 8.42
1 parent 983ae76 commit aeefe0f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
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.42|7.9 |7.9+|8.42|1.8
2425
8.41.1|7.9 |7.9+|8.41.1|1.8
2526
8.40|7.9 |7.9+|8.40|1.8
2627
8.39|7.9 |7.9+|8.39|1.8

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@
9393
</ciManagement>
9494

9595
<properties>
96-
<checkstyle.version>8.41.1</checkstyle.version>
96+
<checkstyle.version>8.42</checkstyle.version>
9797
<sonar.version>7.9</sonar.version>
9898
<sonar-java.version>6.0.0.20538</sonar-java.version>
99-
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
100-
<maven.sevntu.checkstyle.plugin.version>1.37.1</maven.sevntu.checkstyle.plugin.version>
99+
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
100+
<maven.sevntu.checkstyle.plugin.version>1.40.0</maven.sevntu.checkstyle.plugin.version>
101101
<!-- it should be a version of checkstyle that is compatible/compiled with sevntu -->
102102
<maven.sevntu.checkstyle.plugin.checkstyle.version>
103103
8.35

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodChec
9090
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.tokens=definitions to check
9191
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.allowMissingReturnTag=whether to ignore errors when a method returns non-void type does have a return tag in the javadoc. Default is false.
9292
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.allowMissingParamTags=whether to ignore errors when a method has parameters but does not have matching param tags in the javadoc. Default is false.
93-
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.scope=visibility scope where Javadoc comments are checked
94-
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.excludeScope=visibility scope where Javadoc comments are not checked
93+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.accessModifiers=visibility scope where Javadoc comments are checked
9594
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.allowedAnnotations=List of annotations that could allow missed documentation
9695
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.param.validateThrows=Allows validating throws tags
9796
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.name=Javadoc Content Location

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,9 @@
857857
<param key="validateThrows" type="BOOLEAN">
858858
<defaultValue>false</defaultValue>
859859
</param>
860-
<param key="scope" type="s[nothing,public,protected,package,private,anoninner]">
860+
<param key="accessModifiers" type="s[nothing,public,protected,package,private,anoninner]">
861861
<defaultValue>private</defaultValue>
862862
</param>
863-
<param key="excludeScope" type="s[nothing,public,protected,package,private,anoninner]">
864-
</param>
865863
<param key="allowMissingParamTags" type="BOOLEAN">
866864
<defaultValue>false</defaultValue>
867865
</param>

test-resources/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ version: "3"
44
services:
55
sonarqube:
66
image: sonarqube:7.9-community
7+
# next line is for arm64 devices when testing since SQ does not officially release multi-arch images
8+
#image: mwizner/sonarqube:8.7.1-community
79
restart: unless-stopped
810
depends_on:
911
- db

0 commit comments

Comments
 (0)