diff --git a/hadoop-hdds/annotations/pom.xml b/hadoop-hdds/annotations/pom.xml index 84696c60945..5ecd5871bb9 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 d1ce5d53019..5e7ad088708 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 d9e5f6b9658..8971a052f40 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 5809828eccf..995c2ad2b15 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 1ee4017fedf..325b28eba41 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 288085ef948..47010b89e9a 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 +79,16 @@ - - - - - + + + @@ -106,45 +106,31 @@ - - - - - - - - - - - - - - - - - - - - + - - - + + + - - + + + + + + + - + - @@ -154,18 +140,14 @@ - + - - - - @@ -174,16 +156,14 @@ - - - - - + + + @@ -198,18 +178,16 @@ - - - + + - + - diff --git a/hadoop-hdds/dev-support/checkstyle/license.header b/hadoop-hdds/dev-support/checkstyle/license.header new file mode 100644 index 00000000000..805b579a3fb --- /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 00000000000..ed8c510d315 --- /dev/null +++ b/hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml index b84b6e087c3..f1596f08004 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 b2f5907cc68..bdf7f655cec 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 82b58b5a4db..81173d8147a 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 47d94d60df2..34a685421e8 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 8e6cfecea08..2d69d64377e 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -127,6 +127,13 @@ none + + 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 140c77557d5..2429ddca00f 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 0c4d5598192..92165c187b7 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 3eef19f323b..1e7888f0276 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 92059864f29..4cf1efde07d 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 d0cb463ad6f..ae8c25aff17 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 8bdf3bde308..8e2837d9b3b 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 dd07311c98a..d7adbb93369 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -274,6 +274,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 622565a6431..b6193ce76ef 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 4bb4aa24b0d..a1fe21aa104 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 cdbef482ef3..e63b44de52c 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 3e332d63470..ab8a2ac5991 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 3f97007520c..6462790509b 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 3df66eb5033..7aae1196606 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 2bad40c885c..537bb79a9e2 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 b9964f547ee..6a1f21a0025 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 bcaee248d6c..6f917ee33e9 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 6cb03099d7a..e9a82222905 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 2dfb77e9e97..3a166b71ca0 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 7006a5d7b75..28f8ce6f70e 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 d44d9e0cf3e..05d7b70883a 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 ef5440caf87..2fe93d11e07 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 8bd9d8905c0..ef254eee004 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 + +