From 6f03069bb5a4376fe799d26ff65a6efe713efe67 Mon Sep 17 00:00:00 2001
From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:41:39 +0500
Subject: [PATCH 1/5] HDDS-12252. New checkstyle for imports and license with
suppressions
---
hadoop-hdds/annotations/pom.xml | 7 ++
hadoop-hdds/client/pom.xml | 7 ++
hadoop-hdds/common/pom.xml | 7 ++
hadoop-hdds/config/pom.xml | 7 ++
hadoop-hdds/container-service/pom.xml | 7 ++
.../dev-support/checkstyle/checkstyle.xml | 83 +++++++++----------
.../dev-support/checkstyle/license.header | 17 ++++
.../checkstyle/suppressions-skip-imports.xml | 27 ++++++
hadoop-hdds/erasurecode/pom.xml | 7 ++
hadoop-hdds/framework/pom.xml | 7 ++
hadoop-hdds/managed-rocksdb/pom.xml | 7 ++
hadoop-hdds/rocks-native/pom.xml | 7 ++
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 7 ++
hadoop-hdds/server-scm/pom.xml | 7 ++
hadoop-hdds/test-utils/pom.xml | 7 ++
hadoop-hdds/tools/pom.xml | 7 ++
hadoop-ozone/cli-shell/pom.xml | 7 ++
hadoop-ozone/client/pom.xml | 7 ++
hadoop-ozone/common/pom.xml | 7 ++
hadoop-ozone/csi/pom.xml | 7 ++
.../mini-chaos-tests/pom.xml | 7 ++
hadoop-ozone/httpfsgateway/pom.xml | 1 +
hadoop-ozone/insight/pom.xml | 7 ++
hadoop-ozone/integration-test/pom.xml | 7 ++
hadoop-ozone/interface-storage/pom.xml | 7 ++
hadoop-ozone/ozone-manager/pom.xml | 7 ++
hadoop-ozone/ozonefs-common/pom.xml | 7 ++
hadoop-ozone/ozonefs-hadoop2/pom.xml | 7 ++
hadoop-ozone/ozonefs-hadoop3/pom.xml | 7 ++
hadoop-ozone/ozonefs/pom.xml | 7 ++
hadoop-ozone/recon-codegen/pom.xml | 7 ++
hadoop-ozone/recon/pom.xml | 7 ++
hadoop-ozone/s3-secret-store/pom.xml | 7 ++
hadoop-ozone/s3gateway/pom.xml | 7 ++
hadoop-ozone/tools/pom.xml | 7 ++
35 files changed, 301 insertions(+), 44 deletions(-)
create mode 100644 hadoop-hdds/dev-support/checkstyle/license.header
create mode 100644 hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
diff --git a/hadoop-hdds/annotations/pom.xml b/hadoop-hdds/annotations/pom.xml
index 84696c609451..5ecd5871bb97 100644
--- a/hadoop-hdds/annotations/pom.xml
+++ b/hadoop-hdds/annotations/pom.xml
@@ -41,6 +41,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index d1ce5d530190..5e7ad088708d 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -154,6 +154,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index d9e5f6b9658a..8971a052f404 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -323,6 +323,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index 5809828eccf0..995c2ad2b150 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/pom.xml
@@ -79,6 +79,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index 1ee4017fedf7..325b28eba410 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -296,6 +296,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index 288085ef9481..cfa446a3a788 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
+ "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+ "https://checkstyle.org/dtds/configuration_1_2.dtd">
+
+
+
-
+
@@ -77,18 +78,16 @@
-
-
-
-
-
+
+
+
@@ -106,45 +105,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
-
+
-
@@ -154,18 +154,16 @@
-
+
-
-
@@ -174,16 +172,15 @@
-
-
-
-
+
+
+
@@ -198,18 +195,16 @@
-
-
-
+
+
-
diff --git a/hadoop-hdds/dev-support/checkstyle/license.header b/hadoop-hdds/dev-support/checkstyle/license.header
new file mode 100644
index 000000000000..805b579a3fb5
--- /dev/null
+++ b/hadoop-hdds/dev-support/checkstyle/license.header
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
diff --git a/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml b/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
new file mode 100644
index 000000000000..7850e76ed0ee
--- /dev/null
+++ b/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml
index b84b6e087c35..f1596f08004f 100644
--- a/hadoop-hdds/erasurecode/pom.xml
+++ b/hadoop-hdds/erasurecode/pom.xml
@@ -73,6 +73,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index b2f5907cc681..bdf7f655cecc 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -352,6 +352,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/managed-rocksdb/pom.xml b/hadoop-hdds/managed-rocksdb/pom.xml
index 82b58b5a4dbb..81173d8147aa 100644
--- a/hadoop-hdds/managed-rocksdb/pom.xml
+++ b/hadoop-hdds/managed-rocksdb/pom.xml
@@ -66,6 +66,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 47d94d60df2e..34a685421e88 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -81,6 +81,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index ea392b659c01..576b406681fb 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -137,6 +137,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 140c77557d58..2429ddca00ff 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -299,6 +299,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 0c4d55981920..92165c187b7b 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -108,6 +108,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 3eef19f323b4..1e7888f02765 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -199,6 +199,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/cli-shell/pom.xml b/hadoop-ozone/cli-shell/pom.xml
index 92059864f299..4cf1efde07d0 100644
--- a/hadoop-ozone/cli-shell/pom.xml
+++ b/hadoop-ozone/cli-shell/pom.xml
@@ -188,6 +188,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index d0cb463ad6f4..ae8c25aff175 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -163,6 +163,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 8bdf3bde3080..8e2837d9b3b6 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -249,6 +249,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 4ff4764eb18b..7e3f9de0a4d7 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -278,6 +278,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index 622565a64313..b6193ce76ef5 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -77,6 +77,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml
index 4bb4aa24b0d9..a1fe21aa1049 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -215,6 +215,7 @@
maven-checkstyle-plugin
false
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index cdbef482ef38..e63b44de52c9 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -172,6 +172,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 3e332d634705..ab8a2ac5991a 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -283,6 +283,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
index 3f97007520c6..6462790509ba 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -152,6 +152,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 3df66eb5033d..7aae11966065 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -482,6 +482,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml
index 2bad40c885c2..537bb79a9e21 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/pom.xml
@@ -110,6 +110,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index b9964f547ee1..6a1f21a0025c 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -153,6 +153,13 @@
org.apache.hadoop.fs.ozone.*
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index bcaee248d6c0..6f917ee33e94 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -101,6 +101,13 @@
org.apache.hadoop.fs.ozone.*
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index 6cb03099d7a1..e9a82222905a 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/pom.xml
@@ -114,6 +114,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml
index 2dfb77e9e972..3a166b71ca07 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -113,6 +113,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 7006a5d7b750..28f8ce6f70e5 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -511,6 +511,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/s3-secret-store/pom.xml b/hadoop-ozone/s3-secret-store/pom.xml
index d44d9e0cf3ec..05d7b70883a5 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -67,6 +67,13 @@
none
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index ef5440caf87d..2fe93d11e075 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -327,6 +327,13 @@
${basedir}/dev-support/findbugsExcludeFile.xml
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 8bd9d8905c06..ef254eee0044 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -324,6 +324,13 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+
+
From 99cb95820043325db53bd8c9eb454d5540c670ea Mon Sep 17 00:00:00 2001
From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com>
Date: Sat, 8 Feb 2025 12:24:08 +0500
Subject: [PATCH 2/5] HDDS-12252. Check license header format only for java
---
hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index cfa446a3a788..a1b6d2088dc7 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -47,6 +47,7 @@
+
From 0027b9d9fe57e40386891e949dfb879e664ddaaa Mon Sep 17 00:00:00 2001
From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:50:59 +0500
Subject: [PATCH 3/5] HDDS-12252. Add TODO to remove temporary settings file.
---
hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml b/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
index 7850e76ed0ee..ed8c510d3155 100644
--- a/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
+++ b/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml
@@ -12,6 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
+
From 6cf2d13c9b1c3a030c4653ae95b221af4b1f1252 Mon Sep 17 00:00:00 2001
From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com>
Date: Sun, 9 Feb 2025 18:44:55 +0500
Subject: [PATCH 4/5] HDDS-12252. Remove commented out parts of the settings.
---
.../dev-support/checkstyle/checkstyle.xml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index a1b6d2088dc7..47435a469602 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -106,21 +106,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -162,7 +147,6 @@
-
@@ -175,7 +159,6 @@
-
@@ -203,7 +186,7 @@
-
+
From 966145d5e869263d53c516d36a0c02e058fd24b9 Mon Sep 17 00:00:00 2001
From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com>
Date: Sun, 9 Feb 2025 18:57:48 +0500
Subject: [PATCH 5/5] HDDS-12252. Remove old comment.
---
hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index 47435a469602..47010b89e9aa 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -146,7 +146,6 @@
-