You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/11/09 09:20:38 UTC
(logging-log4j2) branch main updated: Remove unused files
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new a0fa9e3602 Remove unused files
a0fa9e3602 is described below
commit a0fa9e3602da6fdb6eba886bce0b115b903629b6
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Nov 9 10:20:29 2023 +0100
Remove unused files
---
checkstyle-import-control.xml | 105 ------------------
checkstyle-suppressions.xml | 25 -----
checkstyle.xml | 242 ------------------------------------------
rewrite.yml | 10 --
spotbugs-exclude-filter.xml | 31 ------
5 files changed, 413 deletions(-)
diff --git a/checkstyle-import-control.xml b/checkstyle-import-control.xml
deleted file mode 100644
index 8d9a0d0799..0000000000
--- a/checkstyle-import-control.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE import-control PUBLIC
- "-//Puppy Crawl//DTD Import Control 1.1//EN"
- "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-
-<!--
- 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.
--->
-
-<import-control pkg="org">
- <!-- Allow all by default -->
- <allow pkg="java" />
- <allow pkg="javax" />
- <allow pkg="org" />
- <allow pkg="com" />
- <allow pkg="net" />
- <allow pkg="ch" />
- <allow pkg="junit" />
- <allow pkg="contribs" />
-
- <!-- Disallow sun.* imports as they are not guaranteed to be the same across all JVMs -->
- <disallow pkg="sun" />
-
- <!-- Disallow Servlet classes everywhere except in specific packages -->
- <disallow pkg="javax.servlet" />
-
- <!-- Disallow optional dependencies JPA, MongoDB, CouchDB, etc. everywhere except in specific packages -->
- <disallow pkg="javax.persistence" />
- <disallow pkg="com.mongodb" />
- <disallow pkg="org.bson" />
- <disallow pkg="org.lightcouch" />
- <disallow pkg="org.codehaus.jackson" />
- <disallow pkg="com.fasterxml.jackson" />
-
- <subpackage name="apache">
-
- <subpackage name="logging">
-
- <subpackage name="log4j">
-
- <subpackage name="core">
-
- <subpackage name="appender">
-
- <subpackage name="db">
-
- <subpackage name="jpa">
- <allow pkg="javax.persistence" />
-
- <subpackage name="converter">
- <allow pkg="com.fasterxml.jackson" />
- </subpackage>
- </subpackage>
-
- <subpackage name="nosql">
-
- <subpackage name="mongo">
- <allow pkg="com.mongodb" />
- <allow pkg="org.bson" />
- </subpackage>
-
- <subpackage name="couch">
- <allow pkg="org.lightcouch" />
- </subpackage>
-
- </subpackage>
-
- </subpackage>
-
- </subpackage>
-
- <subpackage name="config">
- <allow pkg="com.fasterxml.jackson" />
- </subpackage>
-
- <subpackage name="web">
- <allow pkg="javax.servlet" />
- </subpackage>
-
- </subpackage>
-
- <subpackage name="taglib">
- <allow pkg="javax.servlet" />
- </subpackage>
-
- </subpackage>
-
- </subpackage>
-
- </subpackage>
-
-</import-control>
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
deleted file mode 100644
index fd1ad789b3..0000000000
--- a/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<!--
- 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.
--->
-
-<suppressions>
-</suppressions>
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
deleted file mode 100644
index 4ac1c24c95..0000000000
--- a/checkstyle.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
-<!--
- 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.
--->
-
-<!-- Checkstyle configuration that checks the commons-configuration coding conventions -->
-
-<module name="Checker">
- <property name="localeLanguage" value="en"/>
-
- <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sourceforge.net/config_javadoc.html -->
- <module name="JavadocPackage"/>
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile">
- <property name="lineSeparator" value="lf"/>
- </module>
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sourceforge.net/config_header.html#Header -->
- <module name="Header">
- <property name="headerFile" value="${licensedir}"/>
- <property name="fileExtensions" value="java"/>
- <!--<property name="ignoreLines" value="2"/> -->
- </module>
-
- <!-- Checks for Tab characters -->
- <!-- See http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter -->
- <module name="FileTabCharacter">
- <property name="fileExtensions" value="java"/>
- </module>
-
- <!-- Checks for white space at the end of the line -->
- <!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
- <!-- Updated to ignore whitespace following '*' in javadoc comments -->
- <!-- http://stackoverflow.com/questions/9100059/checkstyle-trailing-spaces-regexp-issue -->
- <module name="RegexpSingleline">
- <property name="format" value="(?<!\A[ \t]*\*?)[ \t]$"/>
- <property name="message" value="Line has trailing spaces."/>
- <property name="fileExtensions" value="java"/>
- </module>
-
- <module name="LineLength">
- <property name="max" value="120"/>
- <!-- Ignore import statements -->
- <property name="ignorePattern" value="^import\s.*$"/>
- </module>
-
- <module name="TreeWalker">
-
- <module name="SuppressionCommentFilter" />
- <module name="SuppressWithNearbyCommentFilter"/>
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocMethod">
- <property name="accessModifiers" value="public"/>
- </module>
- <module name="MissingJavadocMethodCheck">
- <property name="allowMissingPropertyJavadoc" value="true"/>
- </module>
- <module name="JavadocType">
- <!-- <property name="authorFormat" value="null"/> -->
- <!-- It is unfortunate to have to do this but checkstyle doesn't allow custom tags -->
- <property name="allowUnknownTags" value="true"/>
- </module>
- <module name="JavadocVariable">
- <property name="scope" value="protected"/>
- </module>
- <module name="JavadocStyle">
- <property name="scope" value="public"/>
- <!-- the checkHtml check is disabled as it generates incorrect errors -->
- <property name="checkHtml" value="false"/>
- </module>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName">
- <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$|^capabilities$|^log$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport">
- <property name="allowStaticMemberImports" value="true"/>
- </module>
- <module name="IllegalImport"/><!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="ImportControl">
- <property name="severity" value="error"/>
- <property name="file" value="checkstyle-import-control.xml"/>
- </module>
- <module name="ImportOrder">
- <!-- Imports must be separated (by one newline) into the following groups:
- java and javax
- org
- com
- all others
- Imports within a group must be sorted alphabetically (lexicographically)
- All static imports come below all other imports -->
- <property name="groups" value="/^javax?\./,org,com"/>
- <property name="ordered" value="true"/>
- <property name="caseSensitive" value="true"/>
- <property name="separated" value="true"/>
- <property name="option" value="bottom"/>
- </module>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <!--<module name="FileLength"/>-->
- <module name="MethodLength"/>
- <module name="ParameterNumber">
- <property name="max" value="15"/>
- </module>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap">
- <property name="tokens" value="ASSIGN"/>
- <property name="option" value="eol"/>
- </module>
- <module name="ParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
- <module name="GenericWhitespace"/>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true"/>
- </module>
- <!-- Require empty catch blocks to have at least a comment -->
- <module name="EmptyBlock">
- <property name="option" value="text"/>
- <property name="tokens" value="LITERAL_CATCH"/>
- </module>
- <module name="LeftCurly">
- <property name="option" value="eol"/>
- </module>
- <module name="NeedBraces"/>
- <module name="RightCurly">
- <property name="option" value="same"/>
- </module>
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="CovariantEquals"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
- <!-- <module name="InnerAssignment"/> -->
- <module name="MagicNumber">
- <property name="ignoreNumbers" value="-1,0,1,2,3,4,5,6,7"/>
- </module>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="SuperClone"/>
- <module name="SuperFinalize"/>
- <module name="DeclarationOrder"/>
- <!-- <module name="ExplicitInitialization"/> -->
- <module name="DefaultComesLast"/>
- <module name="FallThrough"/>
- <module name="MultipleVariableDeclarations"/>
- <!-- <module name="UnnecessaryParentheses"/> -->
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier">
- <property name="protectedAllowed" value="true"/>
- </module>
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <module name="TodoComment">
- <property name="severity" value="info"/>
- </module>
- <module name="UpperEll"/>
-
- <module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
- </module>
-
- </module>
-
-</module>
diff --git a/rewrite.yml b/rewrite.yml
deleted file mode 100644
index 1904d80ec0..0000000000
--- a/rewrite.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Run with:
-# ./mvnw -Prewrite rewrite:run -pl !log4j-bom
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.apache.logging.log4j.rewrite.FinalizeAll
-recipeList:
- - org.openrewrite.staticanalysis.FinalClass
- - org.openrewrite.staticanalysis.FinalizeLocalVariables
- - org.openrewrite.staticanalysis.FinalizeMethodArguments
- - org.openrewrite.staticanalysis.FinalizePrivateFields
diff --git a/spotbugs-exclude-filter.xml b/spotbugs-exclude-filter.xml
deleted file mode 100644
index b77b2f6e7a..0000000000
--- a/spotbugs-exclude-filter.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- 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.
--->
-
-<!-- ===================================================================== -->
-<!-- $Id: spotbugs-exclude-filter.xml 773234 2009-05-09 15:27:59Z rgoers $ -->
-<!-- ===================================================================== -->
-<FindBugsFilter>
- <!-- Enable only high priority warnings -->
- <Match>
- <Priority value="2"/>
- </Match>
-
- <Match>
- <Priority value="3"/>
- </Match>
-</FindBugsFilter>