From 313608e459640d50534666aaaf6175069c97a48d Mon Sep 17 00:00:00 2001
From: Wanqiang Ji <hi@jiwq.me>
Date: Wed, 24 Apr 2019 11:11:51 +0100
Subject: [PATCH] HADOOP-16232. Fix errors in the checkstyle configration xmls.
 Contributed by Wanqiang Ji.

(cherry picked from commit 8b6deebb1dda49e5e35180ed5c5fb5b5221c1516)
(cherry picked from commit 875435dc7d6a7cb7925a25ca3347a7ebaabec595)
(cherry picked from commit 6f0896e08742a792049137ed19700135f8594a42)
---
 .../src/main/resources/checkstyle/checkstyle.xml              | 4 ++--
 .../src/main/resources/checkstyle/suppressions.xml            | 4 ++--
 hadoop-tools/hadoop-azure/src/config/checkstyle.xml           | 4 ++--
 .../hadoop-resourceestimator/src/config/checkstyle.xml        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
index 851b57d3c86..14bf0378310 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/configuration_1_2.dtd">
 
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml b/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
index ccc89c8bf0f..7bc94797df8 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
@@ -13,8 +13,8 @@
   limitations under the License. See accompanying LICENSE file.
 -->
 <!DOCTYPE suppressions PUBLIC
-"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.1//EN"
+    "https://checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
   <suppress checks="JavadocPackage" files="[\\/]src[\\/]test[\\/].*"/>
diff --git a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
index acf6f7f7efe..1db4a2f0a7b 100644
--- a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
+++ b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
@@ -1,7 +1,7 @@
 <?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">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/configuration_1_2.dtd">
 
 <!--
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml b/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
index 7f22659a89f..646c7190f39 100644
--- a/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
+++ b/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
@@ -1,7 +1,7 @@
 <?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">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/configuration_1_2.dtd">
 
 <!--
   Licensed under the Apache License, Version 2.0 (the "License");