Skip to content

Commit ac93904

Browse files
committed
Issue #136: upgrade to checkstyle 8.6
1 parent 28ac66f commit ac93904

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

README.md

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

1515
Checkstyle Plugin|Sonar|Checkstyle|Jdk
1616
-----------------|-----|----------|---
17+
4.6|5.6.6|8.6|1.8
1718
4.5|5.6.6|8.5|1.8
1819
4.4|5.6.6|8.4|1.8
1920
4.3|5.6.6|8.3|1.8

checkstyle-sonar-plugin/config/checkstyle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ checkstyle.suppressions.file=checkstyle-sonar-plugin/config/suppressions.xml
22
checkstyle.header.file=checkstyle-sonar-plugin/config/java.header
33
checkstyle.regexp.header.file=checkstyle-sonar-plugin/config/java_regexp.header
44
checkstyle.importcontrol.file=checkstyle-sonar-plugin/config/import-control.xml
5-
checkstyle.importcontroltest.file=checkstyle-sonar-plugin/config/import-control-test.xml
5+
checkstyle.importcontroltest.file=checkstyle-sonar-plugin/config/import-control-test.xml
6+
checkstyle.suppressions-xpath.file=checkstyle-sonar-plugin/config/suppressions-xpath.xml
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Puppy Crawl//DTD Suppressions Xpath Experimental 1.2//EN"
5+
"http://checkstyle.sourceforge.net/dtds/suppressions_1_2_xpath_experimental.dtd">
6+
7+
<suppressions>
8+
9+
</suppressions>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,8 +1947,8 @@
19471947
<name><![CDATA[Non-Empty Atclause Description]]></name>
19481948
<priority>MAJOR</priority>
19491949
<configKey><![CDATA[Checker/TreeWalker/NonEmptyAtclauseDescription]]></configKey>
1950-
<param key="javadocTokens" type="s[PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,DEPRECATED_LITERAL]">
1951-
<defaultValue>PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,DEPRECATED_LITERAL</defaultValue>
1950+
<param key="javadocTokens" type="s[PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,EXCEPTION_LITERAL,DEPRECATED_LITERAL]">
1951+
<defaultValue>PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,EXCEPTION_LITERAL,DEPRECATED_LITERAL</defaultValue>
19521952
</param>
19531953
</rule>
19541954

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.5</checkstyle.version>
88+
<checkstyle.version>8.6</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)