update to checkstyle 8.18

README.md

@@ -23,6 +23,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar|Checkstyle|Jdk
 -----------------|-----|----------|---
+4.18|6.7  |8.18|1.8
 4.17|6.7  |8.17|1.8
 4.16|5.6.6|8.16|1.8
 4.15|5.6.6|8.15|1.8

checkstyle-sonar-plugin/config/import-control-test.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE import-control PUBLIC
     "-//Puppy Crawl//DTD Import Control 1.3//EN"
-    "http://checkstyle.sourceforge.net/dtds/import_control_1_3.dtd">
+    "https://checkstyle.org/dtds/import_control_1_3.dtd">
 
 <import-control pkg="org.sonar.plugins.checkstyle">
 

checkstyle-sonar-plugin/config/import-control.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE import-control PUBLIC
     "-//Puppy Crawl//DTD Import Control 1.2//EN"
-    "http://checkstyle.sourceforge.net/dtds/import_control_1_2.dtd">
+    "https://checkstyle.org/dtds/import_control_1_2.dtd">
 
 <import-control pkg="com.github.sevntu.checkstyle">
 

checkstyle-sonar-plugin/config/sevntu_suppressions.xml

@@ -2,7 +2,7 @@
 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "https://checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
     <!-- START of legacy code, all violations will be resolved during transition to main project -->

checkstyle-sonar-plugin/config/suppressions-xpath.xml

@@ -2,7 +2,7 @@
 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions Xpath Experimental 1.2//EN"
-    "http://checkstyle.sourceforge.net/dtds/suppressions_1_2_xpath_experimental.dtd">
+    "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
 
 <suppressions>
 

checkstyle-sonar-plugin/config/suppressions.xml

@@ -2,7 +2,7 @@
 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "https://checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
     <!-- START of legacy code, all violations will be resolved during transition to main project -->

checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileExporter.java

@@ -49,7 +49,7 @@ public class CheckstyleProfileExporter extends ProfileExporter {
 
     public static final String DOCTYPE_DECLARATION =
         "<!DOCTYPE module PUBLIC \"-//Puppy Crawl//DTD Check Configuration 1.2//EN\" "
-        + "\"http://www.puppycrawl.com/dtds/configuration_1_2.dtd\">";
+        + "\"https://checkstyle.org/dtds/configuration_1_2.dtd\">";
     private static final String CLOSE_MODULE = "</module>";
 
     private final Configuration configuration;

checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporter.java

@@ -60,6 +60,7 @@ public class CheckstyleProfileImporter extends ProfileImporter {
         "SuppressWarningsFilter",
         "SuppressionCommentFilter",
         "SuppressWithNearbyCommentFilter",
+        "SuppressionXpathSingleFilter",
     };
     private final RuleFinder ruleFinder;
 

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

@@ -241,7 +241,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.n
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.ignoredMethodNames=methods that should not be checked
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.illegalClassNames=classes that should not be used as types in variable declarations, return values or parameters.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.legalAbstractClassNames=abstract classes that may be used as types.
-rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.format=pattern for illegal class name
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.illegalAbstractClassNameFormat=pattern for illegal class name
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.memberModifiers=Methods and fields with only corresponding modifiers (comma separated). Available options are: LITERAL_PUBLIC, LITERAL_PROTECTED, LITERAL_PRIVATE, ABSTRACT, LITERAL_STATIC, FINAL, LITERAL_TRANSIENT, LITERAL_VOLATILE, LITERAL_SYNCHRONIZED, LITERAL_NATIVE, STRICTFP, ANNOTATION, LITERAL_DEFAULT
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.tokens=tokens to check
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.validateAbstractClassNames=Whether to validate abstract class names

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

@@ -715,7 +715,7 @@
     <param key="ignoredMethodNames" type="s{}">
       <defaultValue>"getInitialContext,getEnvironment"</defaultValue>
     </param>
-    <param key="format" type="REGULAR_EXPRESSION">
+    <param key="illegalAbstractClassNameFormat" type="REGULAR_EXPRESSION">
       <defaultValue>^(.*[\\.])?Abstract.*$</defaultValue>
     </param>
     <!--
@@ -1938,7 +1938,7 @@
     <param key="allowSamelineParameterizedAnnotation" type="BOOLEAN">
       <defaultValue>false</defaultValue>
     </param>
-    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,PARAMETER_DEF,ANNOTATION_DEF,TYPECAST,LITERAL_THROWS,IMPLEMENTS_CLAUSE,TYPE_ARGUMENT,LITERAL_NEW,DOT,ANNOTATION_FIELD_DEF]">
+    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,PARAMETER_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF]">
       <defaultValue>CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF</defaultValue>
     </param>
   </rule>

checkstyle-sonar-plugin/src/test/resources/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest/idPropertyShouldBeTheRuleKey.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

checkstyle-sonar-plugin/src/test/resources/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest/shouldUseTheIdPropertyToFindRule.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

checkstyle-sonar-plugin/src/test/resources/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest/simple.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

checkstyle-sonar-plugin/test-resources/checkstyle-conf.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

pom.xml

@@ -84,7 +84,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.17</checkstyle.version>
+    <checkstyle.version>8.18</checkstyle.version>
     <sonar.version>6.7</sonar.version>
     <sonar-java.version>5.9.1.16423</sonar-java.version>
     <java.version>1.8</java.version>