diff --git a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF index dcb9f0fcdf3..a96be1a74c6 100644 --- a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.cdt.meson.core;bundle-version="1.0.0", org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="3.13.0", org.eclipse.ui;bundle-version="3.109.0", - org.apache.log4j;bundle-version="1.2.15", org.hamcrest.library;bundle-version="1.3.0", org.eclipse.launchbar.ui;bundle-version="2.2.0", org.eclipse.launchbar.ui.controls;bundle-version="1.0.1", diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index 5fbaeb91b83..6464f0027ed 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/debug/org.eclipse.cdt.debug.application.product/debug.product @@ -181,6 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + @@ -188,8 +189,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - + + @@ -356,6 +357,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + @@ -422,12 +424,13 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + + diff --git a/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF index fe6d3dce506..113cd78c6fc 100644 --- a/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF @@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.cdt.debug.application, org.eclipse.cdt.core.native Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Import-Package: org.apache.log4j;version="1.2.19", - org.eclipse.cdt.utils.pty, +Import-Package: org.eclipse.cdt.utils.pty, org.eclipse.core.resources, org.eclipse.debug.core Export-Package: org.eclipse.cdt.debug.application.tests;x-internal:=true diff --git a/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java b/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java index ccc0d9f1cb4..31ac1225e28 100644 --- a/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java +++ b/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java @@ -13,9 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.debug.application.tests; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Logger; -import org.apache.log4j.SimpleLayout; import org.eclipse.core.runtime.IPath; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; @@ -24,7 +21,6 @@ import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.waits.DefaultCondition; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.junit.After; -import org.junit.AfterClass; public abstract class StandaloneTest { @@ -34,15 +30,11 @@ public abstract class StandaloneTest { protected static String projectName; protected static SWTBotShell mainShell; protected static SWTBotView projectExplorer; - private static final Logger fLogger = Logger.getRootLogger(); public static void init(String projectName) throws Exception { SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US"; SWTBotPreferences.TIMEOUT = 20000; - fLogger.removeAllAppenders(); - fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT)); - bot = new SWTBot(); Utilities.getDefault().buildProject(projectName); final IPath executablePath = Utilities.getDefault().getProjectPath(projectName).append("a.out"); //$NON-NLS-1$ @@ -82,14 +74,6 @@ public abstract class StandaloneTest { // mainShell.activate(); } - /** - * Test class tear down method. - */ - @AfterClass - public static void tearDown() { - fLogger.removeAllAppenders(); - } - private static final class WaitForFileCondition extends DefaultCondition { private final IPath executablePath; diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index e72309a55ab..859c75b9412 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,13 +1,13 @@ - + - + @@ -50,14 +50,13 @@ - + - - - + + + - @@ -67,8 +66,8 @@ - - + + @@ -79,8 +78,25 @@ - + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + + org.slf4j + slf4j-nop + 1.7.36 + jar + + +