This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit 20dade2c4e6e4d00c0b6c266741606c73d7beac9
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Dec 29 09:09:37 2024 -0500
Normalize Checkstyle configuration
---
checkstyle-suppressions.xml | 27 ----------------------
src/conf/checkstyle/checkstyle-suppressions.xml | 30 ++++++++++++++-----------
src/conf/checkstyle/checkstyle.xml | 2 +-
3 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
deleted file mode 100644
index 2e2e6b4f3..000000000
--- a/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-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.
--->
-<!DOCTYPE suppressions PUBLIC
- "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
- "https://checkstyle.org/dtds/suppressions_1_2.dtd";>
-<suppressions>
- <suppress checks="JavadocMethod" files=".*[/\\]test[/\\].*"/>
- <suppress checks="JavadocPackage" files=".*[/\\]test[/\\].*"/>
- <suppress checks="MagicNumber" files="ColorConversions.java"/>
- <!-- Due to fail in Checkstyle on Windows and in GH Actions -->
- <suppress checks="NewlineAtEndOfFile"
files="target[/\\].*[/\\]pom.properties"/>
-</suppressions>
diff --git a/src/conf/checkstyle/checkstyle-suppressions.xml
b/src/conf/checkstyle/checkstyle-suppressions.xml
index af045c48b..2e2e6b4f3 100644
--- a/src/conf/checkstyle/checkstyle-suppressions.xml
+++ b/src/conf/checkstyle/checkstyle-suppressions.xml
@@ -1,23 +1,27 @@
<?xml version="1.0"?>
<!--
- 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
+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
+ 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.
+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.
-->
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd";>
<suppressions>
- <suppress checks="Header"
files="target/classes/META-INF/maven/org.apache.commons/commons-compress/pom.properties"
/>
+ <suppress checks="JavadocMethod" files=".*[/\\]test[/\\].*"/>
+ <suppress checks="JavadocPackage" files=".*[/\\]test[/\\].*"/>
+ <suppress checks="MagicNumber" files="ColorConversions.java"/>
+ <!-- Due to fail in Checkstyle on Windows and in GH Actions -->
+ <suppress checks="NewlineAtEndOfFile"
files="target[/\\].*[/\\]pom.properties"/>
</suppressions>
diff --git a/src/conf/checkstyle/checkstyle.xml
b/src/conf/checkstyle/checkstyle.xml
index 84a8867db..b594ad68e 100644
--- a/src/conf/checkstyle/checkstyle.xml
+++ b/src/conf/checkstyle/checkstyle.xml
@@ -44,7 +44,7 @@ limitations under the License.
<property name="message" value="Line has trailing spaces." />
</module>
<module name="SuppressionFilter">
- <property name="file" value="checkstyle-suppressions.xml" />
+ <property name="file"
value="src/conf/checkstyle/checkstyle-suppressions.xml" />
</module>
<module name="TreeWalker">
<module name="AvoidStarImport" />
