Issue #188: update all dtd files to reference to most latest versions…

… at checkstyle.org
checkstyle · Mar 7, 2019 · 1b38a80 · 1b38a80
1 parent a973a2f
commit 1b38a80
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/checkstyle-sonar-plugin/config/import-control-test.xml b/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"
-    "https://checkstyle.org/dtds/import_control_1_3.dtd">
+    "-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+    "https://checkstyle.org/dtds/import_control_1_4.dtd">
 
 <import-control pkg="org.sonar.plugins.checkstyle">
 

diff --git a/checkstyle-sonar-plugin/config/import-control.xml b/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"
-    "https://checkstyle.org/dtds/import_control_1_2.dtd">
+    "-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+    "https://checkstyle.org/dtds/import_control_1_4.dtd">
 
 <import-control pkg="com.github.sevntu.checkstyle">
 

diff --git a/checkstyle-sonar-plugin/config/sevntu_suppressions.xml b/checkstyle-sonar-plugin/config/sevntu_suppressions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "https://checkstyle.org/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
 
 <suppressions>
     <!-- START of legacy code, all violations will be resolved during transition to main project -->

diff --git a/checkstyle-sonar-plugin/config/suppressions-xpath.xml b/checkstyle-sonar-plugin/config/suppressions-xpath.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions Xpath Experimental 1.2//EN"
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
     "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
 
 <suppressions>

diff --git a/checkstyle-sonar-plugin/config/suppressions.xml b/checkstyle-sonar-plugin/config/suppressions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "https://checkstyle.org/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
 
 <suppressions>
     <!-- START of legacy code, all violations will be resolved during transition to main project -->

diff --git a/...le-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileExporter.java b/...le-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileExporter.java
@@ -48,8 +48,8 @@
 public class CheckstyleProfileExporter extends ProfileExporter {
 
     public static final String DOCTYPE_DECLARATION =
-        "<!DOCTYPE module PUBLIC \"-//Puppy Crawl//DTD Check Configuration 1.2//EN\" "
-        + "\"https://checkstyle.org/dtds/configuration_1_2.dtd\">";
+        "<!DOCTYPE module PUBLIC \"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN\" "
+        + "\"https://checkstyle.org/dtds/configuration_1_3.dtd\">";
     private static final String CLOSE_MODULE = "</module>";
 
     private final Configuration configuration;

diff --git a/...g/sonar/plugins/checkstyle/CheckstyleProfileImporterTest/idPropertyShouldBeTheRuleKey.xml b/...g/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" "https://checkstyle.org/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

diff --git a/...nar/plugins/checkstyle/CheckstyleProfileImporterTest/shouldUseTheIdPropertyToFindRule.xml b/...nar/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" "https://checkstyle.org/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

diff --git a/.../src/test/resources/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest/simple.xml b/.../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" "https://checkstyle.org/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">

diff --git a/checkstyle-sonar-plugin/test-resources/checkstyle-conf.xml b/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" "https://checkstyle.org/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!-- Generated by Sonar -->
 <module name="Checker">
     <module name="JavadocPackage">