Issue #93: upgrade to checkstyle 7.6.1

checkstyle · Mar 28, 2017 · 26f3397 · 26f3397
1 parent 39ca73f
commit 26f3397
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties b/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -315,6 +315,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameC
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.param.format=Regular expression
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.MissingCtorCheck.name=Missing Constructor
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck.name=Package Declaration
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck.param.matchDirectoryStructure=Whether to check for directory and package name match.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck.name=JavaNCSS
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck.param.classMaximum=the maximum allowed number of non commenting lines in a class. Default is 1500.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck.param.methodMaximum=the maximum allowed number of non commenting lines in a method. Default is 50.

diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml b/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
@@ -1245,6 +1245,10 @@
     <name><![CDATA[Package Declaration]]></name>
     <configKey><![CDATA[Checker/TreeWalker/PackageDeclaration]]></configKey>
     <status>READY</status>
+    <cardinality>MULTIPLE</cardinality>
+    <param key="matchDirectoryStructure" type="BOOLEAN">
+      <defaultValue>true</defaultValue>
+    </param>
   </rule>
 
   <rule key="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
@@ -1303,8 +1307,8 @@
     <param key="option" type="s[nospace,space]">
       <defaultValue>nospace</defaultValue>
     </param>
-    <param key="tokens" type="s[ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL]">
-      <defaultValue>ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL</defaultValue>
+    <param key="tokens" type="s[ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA]">
+      <defaultValue>ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA</defaultValue>
     </param>
   </rule>
 
@@ -1839,8 +1843,8 @@
     <priority>MAJOR</priority>
     <configKey><![CDATA[Checker/TreeWalker/NoLineWrap]]></configKey>
     <cardinality>MULTIPLE</cardinality>
-    <param key="tokens" type="s[IMPORT,PACKAGE_DEF,CLASS_DEF,METHOD_DEF,CTOR_DEF,ENUM_DEF,INTERFACE_DEF]">
-      <defaultValue>PACKAGE_DEF,IMPORT</defaultValue>
+    <param key="tokens" type="s[IMPORT,STATIC_IMPORT,PACKAGE_DEF,CLASS_DEF,METHOD_DEF,CTOR_DEF,ENUM_DEF,INTERFACE_DEF]">
+      <defaultValue>PACKAGE_DEF,IMPORT,STATIC_IMPORT</defaultValue>
     </param>
   </rule>
 

diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>7.6</checkstyle.version>
+    <checkstyle.version>7.6.1</checkstyle.version>
     <sonar.version>5.6.4</sonar.version>
     <sonar-java.version>3.7</sonar-java.version>
     <java.version>1.8</java.version>