This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new e03665f Remove unused imports.
new b713368 Merge branch 'release-2.x' of
https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
e03665f is described below
commit e03665f483305aa709b842db109a40c493732622
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Feb 20 07:16:07 2022 -0500
Remove unused imports.
---
.../src/main/java/org/apache/log4j/RollingFileAppender.java | 8 ++++----
.../src/main/java/org/apache/log4j/WriterAppender.java | 10 +++++-----
.../main/java/org/apache/log4j/bridge/AppenderAdapter.java | 2 --
.../src/main/java/org/apache/log4j/bridge/LayoutAdapter.java | 6 +++---
.../main/java/org/apache/log4j/bridge/LogEventAdapter.java | 8 ++++----
.../main/java/org/apache/log4j/bridge/LogEventWrapper.java | 8 ++++----
.../java/org/apache/log4j/bridge/RewritePolicyWrapper.java | 2 +-
.../main/java/org/apache/log4j/builders/AbstractBuilder.java | 3 ---
.../main/java/org/apache/log4j/builders/BuilderManager.java | 1 -
.../org/apache/log4j/builders/appender/AppenderBuilder.java | 4 ++--
.../log4j/builders/appender/ConsoleAppenderBuilder.java | 2 --
.../apache/log4j/builders/appender/SocketAppenderBuilder.java | 2 --
.../apache/log4j/builders/layout/PatternLayoutBuilder.java | 10 +++++-----
.../org/apache/log4j/builders/layout/XmlLayoutBuilder.java | 1 -
.../main/java/org/apache/log4j/helpers/OptionConverter.java | 1 -
.../src/main/java/org/apache/log4j/helpers/PatternParser.java | 9 +++++----
.../src/main/java/org/apache/log4j/helpers/QuietWriter.java | 6 +++---
.../main/java/org/apache/log4j/or/jms/MessageRenderer.java | 8 ++++----
.../org/apache/log4j/pattern/Log4j1NdcPatternConverter.java | 4 ++--
.../main/java/org/apache/log4j/rewrite/MapRewritePolicy.java | 6 +++---
.../java/org/apache/log4j/rewrite/PropertyRewritePolicy.java | 10 +++++-----
.../main/java/org/apache/log4j/spi/AppenderAttachable.java | 4 ++--
.../java/org/apache/log4j/xml/UnrecognizedElementHandler.java | 3 ++-
log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java | 5 +++--
.../src/test/java/org/apache/log4j/ListAppender.java | 4 ++--
.../src/test/java/org/apache/log4j/LogWithMDCTest.java | 9 +++++----
.../src/test/java/org/apache/log4j/LogWithRouteTest.java | 10 +++++-----
log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java | 9 +++++++--
log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java | 5 +++--
.../src/test/java/org/apache/log4j/PriorityTest.java | 6 ++++--
.../java/org/apache/log4j/bridge/LogEventWrapperTest.java | 6 +++---
.../org/apache/log4j/builders/Log4j2ListAppenderBuilder.java | 4 ----
.../apache/log4j/config/AbstractLog4j1ConfigurationTest.java | 2 +-
.../apache/log4j/config/Log4j1ConfigurationFactoryTest.java | 3 ---
.../test/java/org/apache/log4j/helpers/DateLayoutTest.java | 11 +++++------
.../java/org/apache/log4j/helpers/UtilLoggingLevelTest.java | 2 +-
.../apache/log4j/pattern/Log4j1NdcPatternConverterTest.java | 4 ++--
37 files changed, 95 insertions(+), 103 deletions(-)
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java
index 964c519..2577b9a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java
@@ -17,14 +17,14 @@
package org.apache.log4j;
-import java.io.IOException;
-import java.io.Writer;
import java.io.File;
+import java.io.IOException;
import java.io.InterruptedIOException;
+import java.io.Writer;
-import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.CountingQuietWriter;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.LoggingEvent;
/**
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
index 8f31285..c386faa 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
@@ -17,17 +17,17 @@
package org.apache.log4j;
-import org.apache.log4j.helpers.QuietWriter;
-import org.apache.log4j.spi.ErrorHandler;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import org.apache.log4j.helpers.QuietWriter;
+import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.LoggingEvent;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* WriterAppender appends log events to a {@link Writer} or an
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java
index 3334535..1d36c45 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java
@@ -17,8 +17,6 @@
package org.apache.log4j.bridge;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.log4j.Appender;
import org.apache.logging.log4j.core.Filter;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
index 5494c92..16f763f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
@@ -16,13 +16,13 @@
*/
package org.apache.log4j.bridge;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.log4j.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.layout.ByteBufferDestination;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Class Description goes here.
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
index 71c8e77..5fbb51b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
@@ -16,6 +16,10 @@
*/
package org.apache.log4j.bridge;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.log4j.Category;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LocationInfo;
@@ -28,10 +32,6 @@ import org.apache.logging.log4j.spi.StandardLevel;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Set;
-
/**
* Converts a Log4j 2 LogEvent into the components needed by a Log4j 1.x
LoggingEvent.
* This class requires Log4j 2.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java
index 2a8f7d4..de4f615 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java
@@ -16,6 +16,10 @@
*/
package org.apache.log4j.bridge;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
import org.apache.log4j.NDC;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.LocationInfo;
@@ -35,10 +39,6 @@ import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.TriConsumer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
/**
* Exposes a Log4j 1 logging event as a Log4j 2 LogEvent.
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java
index e0994e1..2a94481 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java
@@ -16,9 +16,9 @@
*/
package org.apache.log4j.bridge;
+import org.apache.log4j.rewrite.RewritePolicy;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.log4j.rewrite.RewritePolicy;
/**
* Binds a Log4j 2 RewritePolicy to Log4j 1.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
index b0cfdcd..4b1ef5b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
@@ -19,9 +19,7 @@ package org.apache.log4j.builders;
import static org.apache.log4j.xml.XmlConfiguration.NAME_ATTR;
import static org.apache.log4j.xml.XmlConfiguration.VALUE_ATTR;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,7 +32,6 @@ import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.Filter;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.filter.CompositeFilter;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
index c3f875e..7add1ff 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.log4j.builders;
-import java.lang.reflect.Constructor;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java
index ff57bae..4dffaf1 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java
@@ -16,14 +16,14 @@
*/
package org.apache.log4j.builders.appender;
+import java.util.Properties;
+
import org.apache.log4j.Appender;
import org.apache.log4j.builders.Builder;
import org.apache.log4j.config.PropertiesConfiguration;
import org.apache.log4j.xml.XmlConfiguration;
import org.w3c.dom.Element;
-import java.util.Properties;
-
/**
* Define an Appender Builder.
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
index e745416..26beef6 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
@@ -23,8 +23,6 @@ import static
org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java
index a48a08a..3a8dcbe 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java
@@ -23,8 +23,6 @@ import static
org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
index 264aa58..f43cc65 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
@@ -16,6 +16,11 @@
*/
package org.apache.log4j.builders.layout;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
+
+import java.util.Properties;
+
import org.apache.log4j.Layout;
import org.apache.log4j.bridge.LayoutWrapper;
import org.apache.log4j.builders.AbstractBuilder;
@@ -31,11 +36,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.Properties;
-
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
-
/**
* Build a Pattern Layout
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java
index 93a3ff4..7b321c4 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java
@@ -30,7 +30,6 @@ import org.apache.log4j.config.PropertiesConfiguration;
import org.apache.log4j.layout.Log4j1XmlLayout;
import org.apache.log4j.xml.XmlConfiguration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.layout.XmlLayout;
import org.w3c.dom.Element;
/**
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
index ad52737..78d9cc1 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
@@ -28,7 +28,6 @@ import org.apache.log4j.Level;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.LoggerRepository;
-import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LoaderUtil;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java
index 865d828..f418ace 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java
@@ -16,14 +16,15 @@
*/
package org.apache.log4j.helpers;
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LocationInfo;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.Map;
-import java.util.Arrays;
+
+import org.apache.log4j.Layout;
+import org.apache.log4j.spi.LocationInfo;
+import org.apache.log4j.spi.LoggingEvent;
// Contributors: Nelson Minar <([email protected]>
// Igor E. Poteryaev <[email protected]>
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
index f05ba64..42120d9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
@@ -17,12 +17,12 @@
package org.apache.log4j.helpers;
-import org.apache.log4j.spi.ErrorCode;
-import org.apache.log4j.spi.ErrorHandler;
-
import java.io.FilterWriter;
import java.io.Writer;
+import org.apache.log4j.spi.ErrorCode;
+import org.apache.log4j.spi.ErrorHandler;
+
/**
* QuietWriter does not throw exceptions when things go
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
index 1666a07..14e1594 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
@@ -16,14 +16,14 @@
*/
package org.apache.log4j.or.jms;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
import org.apache.log4j.or.ObjectRenderer;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
-import javax.jms.Message;
-import javax.jms.JMSException;
-import javax.jms.DeliveryMode;
-
/**
* Log4j 1.x JMS Message Renderer
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
index 405db00..9d50d61 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
@@ -16,6 +16,8 @@
*/
package org.apache.log4j.pattern;
+import java.util.List;
+
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.pattern.ConverterKeys;
@@ -23,8 +25,6 @@ import
org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
import org.apache.logging.log4j.core.pattern.PatternConverter;
import org.apache.logging.log4j.util.Strings;
-import java.util.List;
-
/**
* Returns the event's NDC in a StringBuilder.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
index e157f3c..f16ed38 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
@@ -16,6 +16,9 @@
*/
package org.apache.log4j.rewrite;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.log4j.bridge.LogEventAdapter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.LocationInfo;
@@ -27,9 +30,6 @@ import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.util.SortedArrayStringMap;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* This policy rewrites events where the message of the
* original event implements java.util.Map.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
index 16e765c..a84deac 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
@@ -16,6 +16,11 @@
*/
package org.apache.log4j.rewrite;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.log4j.bridge.LogEventAdapter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.LocationInfo;
@@ -25,11 +30,6 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.util.SortedArrayStringMap;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
/**
* This policy rewrites events by adding
* a user-specified list of properties to the event.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
index 120cb50..bdc2aa9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
@@ -17,10 +17,10 @@
package org.apache.log4j.spi;
-import org.apache.log4j.Appender;
-
import java.util.Enumeration;
+import org.apache.log4j.Appender;
+
/**
* Interface for attaching appenders to objects.
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
index 463d5d9..81e290b 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
@@ -16,9 +16,10 @@
*/
package org.apache.log4j.xml;
-import org.w3c.dom.Element;
import java.util.Properties;
+import org.w3c.dom.Element;
+
/**
* When implemented by an object configured by DOMConfigurator,
* the handle method will be called when an unrecognized child
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java
index bb991ad..5f9c673 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java
@@ -17,13 +17,14 @@
package org.apache.log4j;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.Locale;
import org.apache.log4j.util.SerializationTestHelper;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* Tests of Level.
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java
index 83c2758..573d986 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java
@@ -16,13 +16,13 @@
*/
package org.apache.log4j;
-import org.apache.log4j.spi.LoggingEvent;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* Used to test Log4j 1 support.
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java
index 8c82b73..390a999 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.log4j;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.ClassRule;
import org.junit.Test;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
/**
* Test logging with MDC values.
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java
index a9426c5..26e30bd 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.log4j;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.ClassRule;
import org.junit.Test;
-import java.util.List;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
/**
* Test passing MDC values to the Routing appender.
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
index 0c4308f..ac288dd 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
@@ -17,6 +17,13 @@
package org.apache.log4j;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -34,8 +41,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* Used for internal unit testing the Logger class.
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
index a30dd88..970394a 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.log4j;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.ClassRule;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java
index 63321a7..09f6386 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java
@@ -17,12 +17,14 @@
package org.apache.log4j;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Locale;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
* Tests of Priority.
*
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java
index af38045..3f599d6 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java
@@ -17,13 +17,13 @@
package org.apache.log4j.bridge;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
import org.apache.log4j.spi.LoggingEvent;
import org.apache.logging.log4j.core.LogEvent;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
public class LogEventWrapperTest {
@Test
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java
index 825a083..a325338 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java
@@ -19,13 +19,9 @@ package org.apache.log4j.builders;
import static org.apache.log4j.builders.BuilderManager.CATEGORY;
import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.NAME_ATTR;
import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.log4j.Appender;
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java
index 675c287..63839e2 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java
@@ -38,9 +38,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.ListAppender;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
+import org.apache.log4j.bridge.AppenderAdapter.Adapter;
import org.apache.log4j.bridge.FilterAdapter;
import org.apache.log4j.bridge.FilterWrapper;
-import org.apache.log4j.bridge.AppenderAdapter.Adapter;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Layout;
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index 935a13a..af9ab1d 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -29,14 +29,11 @@ import java.net.URL;
import org.apache.log4j.layout.Log4j1XmlLayout;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.ConsoleAppender.Target;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.apache.logging.log4j.core.filter.DenyAllFilter;
-import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.junit.Test;
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
index 0573e78..e650f3d 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
@@ -17,15 +17,14 @@
package org.apache.log4j.helpers;
-import org.apache.log4j.Layout;
-import org.apache.log4j.LayoutTest;
-import org.apache.log4j.spi.LoggingEvent;
-
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-
-import java.util.TimeZone;
import java.util.Calendar;
+import java.util.TimeZone;
+
+import org.apache.log4j.Layout;
+import org.apache.log4j.LayoutTest;
+import org.apache.log4j.spi.LoggingEvent;
/**
* Tests {@link DateLayout}.
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java
index ad2868b..6ac556a 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java
@@ -17,7 +17,7 @@
package org.apache.log4j.helpers;
-import junit.framework.*;
+import junit.framework.TestCase;
/**
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
index 2f0b80f..96efa84 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.log4j.pattern;
+import static org.junit.Assert.assertEquals;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.LogEvent;
@@ -25,8 +27,6 @@ import org.apache.logging.log4j.message.SimpleMessage;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
public class Log4j1NdcPatternConverterTest {
@Rule
