Changed log4j to slf4j

eclipse-mpc · Nov 10, 2022 · 11b9c2d · 11b9c2d
1 parent 0bb5039
commit 11b9c2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",
  org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",
- org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.equinox.p2.ui.discovery;bundle-version="1.0.0",
  org.hamcrest.core;bundle-version="1.3.0",
  org.hamcrest.library;bundle-version="1.3.0",
@@ -26,7 +25,8 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.userstorage;bundle-version="[1.1.0,2.0.0)",
  org.mockito;bundle-version="1.9.5",
  org.apache.httpcomponents.client5.httpclient5,
- org.apache.httpcomponents.httpclient
+ org.apache.httpcomponents.httpclient,
+ org.slf4j.api;bundle-version="1.7.30"
 Import-Package: org.apache.hc.client5.http.auth;version="[5.1.0,5.2.0)",
  org.apache.hc.client5.http.classic;version="[5.1.0,5.2.0)",
  org.apache.hc.client5.http.classic.methods;version="[5.1.0,5.2.0)",

diff --git a/...p.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/AbstractMarketplaceWizardBotTest.java b/...p.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/AbstractMarketplaceWizardBotTest.java
@@ -38,7 +38,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.epp.internal.mpc.core.model.Node;
@@ -102,6 +101,8 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.notification.Failure;
 import org.junit.runners.model.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractMarketplaceWizardBotTest {
 
@@ -132,7 +133,7 @@ private static INode testNode(String id, String url, String name) {
 
 	private static long PROGRESS_TIMEOUT = Long.getLong("org.eclipse.epp.mpc.tests.progress.timeout", 30000);
 
-	private static final Logger logger = Logger.getLogger(AbstractMarketplaceWizardBotTest.class);
+	private static final Logger logger = LoggerFactory.getLogger(AbstractMarketplaceWizardBotTest.class);
 
 	private static boolean dumpThreadsOnTearDownError = Boolean.valueOf(System.getProperty(
 			"org.eclipse.epp.mpc.tests.dump.threads", "true"));
@@ -325,7 +326,7 @@ private static void dumpThreads() {
 			Method dumpMethod = ThreadMXBean.class.getMethod("dumpAllThreads", Boolean.TYPE, Boolean.TYPE);
 			ThreadInfo[] threadInfos = (ThreadInfo[]) dumpMethod.invoke(threadMXBean, true, true);
 			for (ThreadInfo threadInfo : threadInfos) {
-				logger.debug(threadInfo);
+				logger.debug(threadInfo.toString());
 			}
 		} catch (NoSuchMethodException e) {
 			dumpThreadsOnTearDownError = false;