cleaning up deprecated usage

log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java

@@ -16,7 +16,6 @@
 
 package org.apache.log4j.spi;
 
-import org.apache.log4j.spi.LoggerRepository;
 import java.net.URL;
 
 /**

slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java

@@ -35,11 +35,11 @@
  */
 public class MessageFormatterTest {
 
-    Integer i1 = new Integer(1);
-    Integer i2 = new Integer(2);
-    Integer i3 = new Integer(3);
+    Integer i1 = Integer.valueOf(1);
+    Integer i2 = Integer.valueOf(2);
+    Integer i3 = Integer.valueOf(3);
     Integer[] ia0 = new Integer[] { i1, i2, i3 };
-    Integer[] ia1 = new Integer[] { new Integer(10), new Integer(20), new Integer(30) };
+    Integer[] ia1 = new Integer[] { Integer.valueOf(10), Integer.valueOf(20), Integer.valueOf(30) };
 
     String result;
 

slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java

@@ -84,7 +84,7 @@ public static String render(Object o) {
                     return o.toString();
                 }
             } catch (Exception e) {
-                Long now = new Long(System.currentTimeMillis());
+                Long now = Long.valueOf(System.currentTimeMillis());
 
                 System.err.println("Disabling exception throwing class " + objectClass.getName() + ", " + e.getMessage());
 

slf4j-jdk14/src/test/java/org/slf4j/jul/InvocationTest.java

@@ -82,9 +82,9 @@ public void smoke() {
 
 	@Test
 	public void verifyMessageFormatting() {
-		Integer i1 = new Integer(1);
-		Integer i2 = new Integer(2);
-		Integer i3 = new Integer(3);
+		Integer i1 = Integer.valueOf(1);
+		Integer i2 = Integer.valueOf(2);
+		Integer i3 = Integer.valueOf(3);
 		Exception e = new Exception("This is a test exception.");
 		Logger logger = LoggerFactory.getLogger("test2");
 
@@ -110,7 +110,7 @@ public void verifyMessageFormatting() {
 		logger.warn("Hello world 3", e);
 
 		logger.error("Hello world 4.");
-		logger.error("Hello world {}", new Integer(3));
+		logger.error("Hello world {}", Integer.valueOf(3));
 		logger.error("Hello world 4.", e);
 	}
 

slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java

@@ -34,7 +34,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.jul.JDK14LoggerFactory;
 
 public class JDK14AdapterLoggerNameTest {
     private MockHandler mockHandler;

slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java

@@ -3,7 +3,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import org.apache.log4j.MDC;
 import org.apache.log4j.helpers.ThreadLocalMap;
 
 public class MDCFriend {

slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java

@@ -8,7 +8,6 @@
 import org.apache.log4j.MDC;
 import org.apache.log4j.MDCFriend;
 import org.junit.Test;
-import org.slf4j.log4j12.VersionUtil;
 
 public class MDCFriendTest {
 

slf4j-nop/src/test/java/org/slf4j/nop/InvocationTest.java

@@ -49,9 +49,9 @@ public void test1() {
 
     @Test
     public void test2() {
-        Integer i1 = new Integer(1);
-        Integer i2 = new Integer(2);
-        Integer i3 = new Integer(3);
+        Integer i1 = Integer.valueOf(1);
+        Integer i2 = Integer.valueOf(2);
+        Integer i3 = Integer.valueOf(3);
         Exception e = new Exception("This is a test exception.");
         Logger logger = LoggerFactory.getLogger("test2");
 
@@ -67,7 +67,7 @@ public void test2() {
         logger.warn("Hello world 3", e);
 
         logger.error("Hello world 4.");
-        logger.error("Hello world {}", new Integer(3));
+        logger.error("Hello world {}", Integer.valueOf(3));
         logger.error("Hello world 4.", e);
     }
 

slf4j-simple/src/test/java/org/slf4j/simple/InvocationTest.java

@@ -65,9 +65,9 @@ public void test1() {
 
     @Test
     public void test2() {
-        Integer i1 = new Integer(1);
-        Integer i2 = new Integer(2);
-        Integer i3 = new Integer(3);
+        Integer i1 = Integer.valueOf(1);
+        Integer i2 = Integer.valueOf(2);
+        Integer i3 = Integer.valueOf(3);
         Exception e = new Exception("This is a test exception.");
         Logger logger = LoggerFactory.getLogger("test2");
 
@@ -83,7 +83,7 @@ public void test2() {
         logger.warn("Hello world 3", e);
 
         logger.error("Hello world 4.");
-        logger.error("Hello world {}", new Integer(3));
+        logger.error("Hello world {}", Integer.valueOf(3));
         logger.error("Hello world 4.", e);
     }
 

slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerMultithreadedInitializationTest.java

@@ -33,7 +33,6 @@
 import org.junit.Before;
 import org.slf4j.LoggerFactoryFriend;
 import org.slf4j.testHarness.MultithreadedInitializationTest;
-import org.slf4j.simple.SimpleLogger;
 
 public class SimpleLoggerMultithreadedInitializationTest extends MultithreadedInitializationTest {
     // final static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2;