From 3c856b4467319682a2fb2c743c5267fbd6ce45ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bu=CC=80i=20Vie=CC=A3=CC=82t=20Tha=CC=80nh?= Date: Mon, 10 Feb 2020 18:10:54 +0700 Subject: [PATCH] Update XML DTD URL see checkstyle/checkstyle#6478 --- .../scala/com/etsy/sbt/checkstyle/Checkstyle.scala | 11 +++++++++-- .../checkstyle/checkstyle-auto/checkstyle-config.xml | 4 ++-- .../checkstyle-check-empty/checkstyle-config.xml | 4 ++-- .../checkstyle-check/my-checkstyle-config.xml | 4 ++-- .../src/main/resources/com/etsy/sbt/google_checks.xml | 4 ++-- .../my-checkstyle-config.xml | 4 ++-- .../test-checkstyle-config.xml | 4 ++-- .../checkstyle-test-auto/checkstyle-config.xml | 4 ++-- .../checkstyle/checkstyle-test/checkstyle-config.xml | 4 ++-- .../checkstyle/checkstyle-xslt/checkstyle-config.xml | 4 ++-- .../checkstyle/checkstyle/checkstyle-config.xml | 4 ++-- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/main/scala/com/etsy/sbt/checkstyle/Checkstyle.scala b/src/main/scala/com/etsy/sbt/checkstyle/Checkstyle.scala index e59e58f..53724de 100644 --- a/src/main/scala/com/etsy/sbt/checkstyle/Checkstyle.scala +++ b/src/main/scala/com/etsy/sbt/checkstyle/Checkstyle.scala @@ -34,8 +34,15 @@ object Checkstyle { val config = scala.xml.XML.loadString(configLocation.read(resources)) scala.xml.XML.save(configFile, config, "UTF-8", xmlDecl = true, - scala.xml.dtd.DocType("module", scala.xml.dtd.PublicID("-//Puppy Crawl//DTD Check Configuration 1.3//EN", - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"), Nil)) + scala.xml.dtd.DocType( + "module", + scala.xml.dtd.PublicID( + "-//Puppy Crawl//DTD Check Configuration 1.3//EN", + "https://checkstyle.org/dtds/configuration_1_3.dtd" + ), + Nil + ) + ) val checkstyleArgs = Array( "-c", configFile, // checkstyle configuration file diff --git a/src/sbt-test/checkstyle/checkstyle-auto/checkstyle-config.xml b/src/sbt-test/checkstyle/checkstyle-auto/checkstyle-config.xml index 814994f..92cfb8e 100644 --- a/src/sbt-test/checkstyle/checkstyle-auto/checkstyle-config.xml +++ b/src/sbt-test/checkstyle/checkstyle-auto/checkstyle-config.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> diff --git a/src/sbt-test/checkstyle/checkstyle-check-empty/checkstyle-config.xml b/src/sbt-test/checkstyle/checkstyle-check-empty/checkstyle-config.xml index 814994f..92cfb8e 100644 --- a/src/sbt-test/checkstyle/checkstyle-check-empty/checkstyle-config.xml +++ b/src/sbt-test/checkstyle/checkstyle-check-empty/checkstyle-config.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> diff --git a/src/sbt-test/checkstyle/checkstyle-check/my-checkstyle-config.xml b/src/sbt-test/checkstyle/checkstyle-check/my-checkstyle-config.xml index de5b9a2..27c9374 100755 --- a/src/sbt-test/checkstyle/checkstyle-check/my-checkstyle-config.xml +++ b/src/sbt-test/checkstyle/checkstyle-check/my-checkstyle-config.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> diff --git a/src/sbt-test/checkstyle/checkstyle-config-classpath/src/main/resources/com/etsy/sbt/google_checks.xml b/src/sbt-test/checkstyle/checkstyle-config-classpath/src/main/resources/com/etsy/sbt/google_checks.xml index 3f21853..7d1d720 100644 --- a/src/sbt-test/checkstyle/checkstyle-config-classpath/src/main/resources/com/etsy/sbt/google_checks.xml +++ b/src/sbt-test/checkstyle/checkstyle-config-classpath/src/main/resources/com/etsy/sbt/google_checks.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd">