diff --git a/src/main/java/org/apache/commons/logging/LogFactory.java b/src/main/java/org/apache/commons/logging/LogFactory.java
index 9773a88..ff987e0 100644
--- a/src/main/java/org/apache/commons/logging/LogFactory.java
+++ b/src/main/java/org/apache/commons/logging/LogFactory.java
@@ -17,11 +17,9 @@
 
 package org.apache.commons.logging;
 
-import java.io.BufferedReader;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.lang.ref.WeakReference;
 import java.net.URL;
diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
index 1abf6fb..3404667 100644
--- a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
@@ -17,13 +17,13 @@
 
 package org.apache.commons.logging.impl;
 
-import java.io.Serializable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.LogRecord;
-import java.util.StringTokenizer;
 import java.io.PrintWriter;
+import java.io.Serializable;
 import java.io.StringWriter;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
 import org.apache.commons.logging.Log;
 
diff --git a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
index abd896b..f1a1309 100644
--- a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
@@ -18,10 +18,11 @@
 package org.apache.commons.logging.impl;
 
 import java.io.Serializable;
+
 import org.apache.commons.logging.Log;
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
-import org.apache.log4j.Level;
 
 /**
  * Implementation of {@link Log} that maps directly to a
diff --git a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
index a05e8f0..6ab8eeb 100644
--- a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
@@ -18,9 +18,10 @@
 package org.apache.commons.logging.impl;
 
 import java.io.Serializable;
-import org.apache.log.Logger;
-import org.apache.log.Hierarchy;
+
 import org.apache.commons.logging.Log;
+import org.apache.log.Hierarchy;
+import org.apache.log.Logger;
 
 /**
  * Implementation of {@code org.apache.commons.logging.Log}
diff --git a/src/main/java/org/apache/commons/logging/impl/NoOpLog.java b/src/main/java/org/apache/commons/logging/impl/NoOpLog.java
index c5aed46..97fc43e 100644
--- a/src/main/java/org/apache/commons/logging/impl/NoOpLog.java
+++ b/src/main/java/org/apache/commons/logging/impl/NoOpLog.java
@@ -18,6 +18,7 @@
 package org.apache.commons.logging.impl;
 
 import java.io.Serializable;
+
 import org.apache.commons.logging.Log;
 
 /**
diff --git a/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java b/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
index d4b5e40..83c860a 100644
--- a/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
+++ b/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
@@ -17,9 +17,10 @@
 
 package org.apache.commons.logging;
 
-import junit.framework.TestCase;
 import java.util.Hashtable;
 
+import junit.framework.TestCase;
+
 /**
  * Tests behavior when the property is misconfigured.
  */
diff --git a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
index f8d6d14..3dd89e8 100644
--- a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
+++ b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
@@ -16,14 +16,14 @@
  */
 package org.apache.commons.logging.avalon;
 
-import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.commons.logging.impl.AvalonLogger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.AbstractLogTest;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.avalon.framework.logger.NullLogger;
+import org.apache.commons.logging.AbstractLogTest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.AvalonLogger;
+
 /**
  */
 public class AvalonLoggerTestCase extends AbstractLogTest {
diff --git a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
index f15d26b..241954e 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
@@ -20,8 +20,8 @@ package org.apache.commons.logging.jdk14;
 
 import junit.framework.Test;
 
-import org.apache.commons.logging.PathableTestSuite;
 import org.apache.commons.logging.PathableClassLoader;
+import org.apache.commons.logging.PathableTestSuite;
 
 
 /**
diff --git a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java b/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
index a57c72a..5ec4b04 100644
--- a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
@@ -22,10 +22,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.apache.commons.logging.AbstractLogTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.impl.NoOpLog;
-import org.apache.commons.logging.AbstractLogTest;
 
 /**
  * Tests for NoOpLog logging adapter.
diff --git a/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java b/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
index 415bc50..24b561d 100644
--- a/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
+++ b/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
@@ -17,6 +17,7 @@
 package org.apache.commons.logging.serviceloader;
 
 import junit.framework.TestCase;
+
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.serviceloader.internal.DummyLogFactory;
 
diff --git a/src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java b/src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java
index 8877e63..6aaa317 100644
--- a/src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java
+++ b/src/test/java/org/apache/commons/logging/simple/DecoratedSimpleLog.java
@@ -18,9 +18,10 @@
 package org.apache.commons.logging.simple;
 
 
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.text.DateFormat;
+
 import org.apache.commons.logging.impl.SimpleLog;
 
 
diff --git a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
index 084a7d7..0073c02 100644
--- a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
@@ -16,14 +16,14 @@
  */
 package org.apache.commons.logging.tccl;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.PathableClassLoader;
 import org.apache.commons.logging.PathableTestSuite;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 /**
  * Simulates the case when TCCL is badly set and cannot load JCL.
  */
diff --git a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
index 271a1f3..255a333 100644
--- a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
@@ -16,13 +16,13 @@
  */
 package org.apache.commons.logging.tccl;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.PathableTestSuite;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 /**
  * Simulates the case when TCCL is set to NULL.
  */