From fa34aea5ad0a32011b2f62bd6ad90f2ee849895f Mon Sep 17 00:00:00 2001
From: Roman Ivanov <ivanov-jr@mail.ru>
Date: Sun, 26 Feb 2017 17:22:27 -0800
Subject: [PATCH] Issue #81: upgrade to checkstyle 7.6

---
 .../resources/org/sonar/l10n/checkstyle.properties     |  2 +-
 .../resources/org/sonar/plugins/checkstyle/rules.xml   | 10 +++++-----
 pom.xml                                                |  2 +-
 3 files changed, 7 insertions(+), 7 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
index a606008e..903ce61c 100644
--- a/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
+++ b/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -191,7 +191,6 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeChe
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck.param.allowMarkerInterfaces=Controls whether marker interfaces like Serializable are allowed. Default is true.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.name=NPath Complexity
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.param.max=the maximum threshold allowed. Default is 200.
-rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.param.tokens=tokens to check
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck.name=Simplify Boolean Return
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck.name=Cyclomatic Complexity
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck.param.max=the maximum threshold allowed.
@@ -372,6 +371,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceArou
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.param.allowEmptyTypes=allow empty class, interface and enum bodies
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.param.allowEmptyLoops=allow empty loop bodies
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.param.allowEmptyLambdas=allow empty lambda bodies. Default is false.
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.param.allowEmptyCatches=allow empty catch blocks. Default is false.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.param.ignoreEnhancedForColon=ignore whitespace around colon in for-each loops
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck.name=No Finalizer
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.UpperEllCheck.name=Upper Ell
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
index ce398005..e645ca0b 100644
--- 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
@@ -1148,9 +1148,6 @@
     <configKey><![CDATA[Checker/TreeWalker/NPathComplexity]]></configKey>
     <param key="max" type="INTEGER">
     </param>
-    <param key="tokens" type="STRING">
-      <defaultValue>LITERAL_WHILE,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_ELSE,LITERAL_SWITCH,LITERAL_CASE,LITERAL_TRY,LITERAL_CATCH,QUESTION</defaultValue>
-    </param>
   </rule>
 
   <rule key="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck">
@@ -1222,8 +1219,8 @@
     <param key="allowLineBreaks" type="BOOLEAN">
       <defaultValue>false</defaultValue>
     </param>
-    <param key="tokens" type="s[COMMA,SEMI,POST_INC,POST_DEC,DOT,GENERIC_START,GENERIC_END]">
-      <defaultValue>COMMA,SEMI,POST_INC,POST_DEC</defaultValue>
+    <param key="tokens" type="s[COMMA,SEMI,POST_INC,POST_DEC,DOT,GENERIC_START,GENERIC_END,ELLIPSIS]">
+      <defaultValue>COMMA,SEMI,POST_INC,POST_DEC,ELLIPSIS</defaultValue>
     </param>
   </rule>
 
@@ -1631,6 +1628,9 @@
     <param key="allowEmptyLambdas" type="BOOLEAN">
       <defaultValue>false</defaultValue>
     </param>
+    <param key="allowEmptyCatches" type="BOOLEAN">
+      <defaultValue>false</defaultValue>
+    </param>
     <param key="ignoreEnhancedForColon" type="BOOLEAN">
       <defaultValue>true</defaultValue>
     </param>
diff --git a/pom.xml b/pom.xml
index f4bdc4a9..20023817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>7.5.1</checkstyle.version>
+    <checkstyle.version>7.6</checkstyle.version>
     <sonar.version>5.6.4</sonar.version>
     <sonar-java.version>3.7</sonar-java.version>
     <java.version>1.8</java.version>