This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch LoggerContextProperties in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 563ef533609df5fcae51bfa75c7848f12d626c61 Author: Ralph Goers <[email protected]> AuthorDate: Sat May 6 20:54:50 2023 -0700 Everything builds --- .../logging/log4j/core/impl/Log4jContextFactory.java | 3 +++ .../apache/logging/log4j/core/osgi/Activator.java | 3 +-- .../logging/log4j/jms/appender/JmsAppenderTest.java | 3 ++- log4j-jul/pom.xml | 2 +- .../log4j/jul/test/AsyncLoggerThreadsTest.java | 6 +++--- .../kafka/builder/ConfigurationAssemblerTest.java | 10 +++++----- .../JsonTemplateLayoutNullEventDelimiterTest.java | 2 +- .../log4j/perf/jmh/AsyncLoggersBenchmark.java | 8 ++++---- .../log4j/perf/jmh/ThreadContextBenchmark.java | 5 +++-- .../logging/log4j/script/ScriptManagerImpl.java | 3 ++- .../script/appender/ScriptAppenderSelectorTest.java | 2 +- .../RollingAppenderDeleteScriptFri13thTest.java | 20 ++++++++++---------- .../rolling/RollingAppenderDeleteScriptTest.java | 10 +++++----- .../appender/rolling/action/ScriptConditionTest.java | 11 +++++------ .../routing/DefaultRouteScriptAppenderTest.java | 6 +++--- .../appender/routing/RoutesScriptAppenderTest.java | 12 ++++++------ .../log4j/script/layout/PatternSelectorTest.java | 1 - .../log4j/spring/boot/Log4j2SpringBootInitTest.java | 3 ++- .../boot/Log4j2SpringBootLoggingSystemTest.java | 6 +++--- 19 files changed, 60 insertions(+), 56 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java index 68ef0db512..5e58213475 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java @@ -359,6 +359,9 @@ public class Log4jContextFactory implements LoggerContextFactory, ShutdownCallba } ContextAnchor.THREAD_CONTEXT.remove(); } else { + if (ctx.getProperties() == null) { + ctx.setProperties(PropertiesUtil.getContextProperties(classLoader, name)); + } ctx.start(); } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java index 5c0f82a45a..23e96b540d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java @@ -56,7 +56,6 @@ public final class Activator implements BundleActivator { pluginRegistry = context.getService(pluginRegistryServiceRegistration.getReference()); final Bundle bundle = context.getBundle(); final ClassLoader classLoader = bundle.adapt(BundleWiring.class).getClassLoader(); - final PropertyEnvironment props = PropertiesUtil.locateProperties(classLoader); injectorCallbackServiceRegistration = context.registerService(InjectorCallback.class, new InjectorCallback() { @Override @@ -64,7 +63,7 @@ public final class Activator implements BundleActivator { injector.registerBinding(Key.forClass(PluginRegistry.class), () -> context.getService(pluginRegistryServiceRegistration.getReference())); // allow the user to override the default ContextSelector (e.g., by using BasicContextSelector for a global cfg) - if (props.getStringProperty(Log4jPropertyKey.CONTEXT_SELECTOR_CLASS_NAME) == null) { + if (PropertiesUtil.getProperties().getStringProperty(Log4jPropertyKey.CONTEXT_SELECTOR_CLASS_NAME) == null) { injector.registerBinding(ContextSelector.KEY, () -> new BundleContextSelector(injector)); } } diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java index b6957ecd27..729ba24309 100644 --- a/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java +++ b/log4j-jms/src/test/java/org/apache/logging/log4j/jms/appender/JmsAppenderTest.java @@ -31,6 +31,7 @@ import javax.jms.TextMessage; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.categories.Appenders; import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.apache.logging.log4j.jndi.test.junit.JndiRule; @@ -84,7 +85,7 @@ public class JmsAppenderTest { @BeforeClass public static void beforeClass() throws Exception { - System.setProperty("log4j2.enableJndiJms", "true"); + System.setProperty(Log4jPropertyKey.JNDI_ENABLE_JMS.getSystemKey(), "true"); } public JmsAppenderTest() throws Exception { diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml index 8204f8dff5..61b50ae18a 100644 --- a/log4j-jul/pom.xml +++ b/log4j-jul/pom.xml @@ -152,7 +152,7 @@ </includes> <systemPropertyVariables> <java.util.logging.config.file>src/test/resources/logging-test.properties</java.util.logging.config.file> - <log4j2.configurationFile>log4j2-julBridge-test.xml</log4j2.configurationFile> + <Configuration.file>log4j2-julBridge-test.xml</Configuration.file> </systemPropertyVariables> </configuration> </execution> diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java index 6e07035ce8..cb2bf7602f 100644 --- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java +++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java @@ -16,6 +16,9 @@ */ package org.apache.logging.log4j.jul.test; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; @@ -26,9 +29,6 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.List; -import java.util.stream.Collectors; - import static org.junit.Assert.assertEquals; //@Category(AsyncLoggers.class) diff --git a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java index 0be50c78c0..f0f2d2274c 100644 --- a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java +++ b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java @@ -16,11 +16,6 @@ */ package org.apache.logging.log4j.kafka.builder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.List; import java.util.Map; @@ -46,6 +41,11 @@ import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.kafka.appender.KafkaAppender; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * */ diff --git a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java index f34ca6d6a1..7831ded1ac 100644 --- a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java +++ b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java @@ -45,7 +45,7 @@ class JsonTemplateLayoutNullEventDelimiterTest { "serverPort", String.valueOf(server.getPort())); System.setProperty( - Log4jPropertyKey.CONFIG_LOCATION, + Log4jPropertyKey.CONFIG_LOCATION.getSystemKey(), "nullEventDelimitedJsonTemplateLayoutLogging.xml"); // Produce log events. diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java index b4770d9334..d780876612 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersBenchmark.java @@ -57,10 +57,10 @@ public class AsyncLoggersBenchmark { @Setup(Level.Trial) public void up() { - System.setProperty(Log4jPropertyKey.CONFIG_LOCATION, "perf-WithoutAnyAppender.xml"); - System.setProperty(Log4jPropertyKey.CONTEXT_SELECTOR_CLASS_NAME, "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"); - System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_RING_BUFFER_SIZE, "262144"); - System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_WAIT_STRATEGY, "Yield"); + System.setProperty(Log4jPropertyKey.CONFIG_LOCATION.getSystemKey(), "perf-WithoutAnyAppender.xml"); + System.setProperty(Log4jPropertyKey.CONTEXT_SELECTOR_CLASS_NAME.getSystemKey(), "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"); + System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_RING_BUFFER_SIZE.getSystemKey(), "262144"); + System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_WAIT_STRATEGY.getSystemKey(), "Yield"); //System.setProperty(LoggingSystemProperties.SYSTEM_THREAD_LOCALS_ENABLED, "true"); //System.setProperty(Log4jProperties.ASYNC_LOGGER_FORMAT_MESSAGES_IN_BACKGROUND, "true"); diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java index 6e8f357cf0..56b9bf8888 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java @@ -103,7 +103,8 @@ public class ThreadContextBenchmark { @Setup public void setup() { - System.setProperty(LoggingSystemProperty.THREAD_CONTEXT_MAP_CLASS, IMPLEMENTATIONS.get(threadContextMapAlias).getName()); + System.setProperty(LoggingSystemProperty.THREAD_CONTEXT_MAP_CLASS.getSystemKey(), + IMPLEMENTATIONS.get(threadContextMapAlias).getName()); ThreadContextBenchmarkAccess.init(); injector = ContextDataInjectorFactory.createInjector(); @@ -139,7 +140,7 @@ public class ThreadContextBenchmark { @TearDown public void tearDown() { - System.clearProperty(LoggingSystemProperty.THREAD_CONTEXT_MAP_CLASS); + System.clearProperty(LoggingSystemProperty.THREAD_CONTEXT_MAP_CLASS.getSystemKey()); ThreadContextBenchmarkAccess.init(); } diff --git a/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java b/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java index 99c357fa61..4f9be4dfc9 100644 --- a/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java +++ b/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java @@ -39,6 +39,7 @@ import javax.script.SimpleBindings; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.script.Script; import org.apache.logging.log4j.core.script.ScriptBindings; import org.apache.logging.log4j.core.script.ScriptManager; @@ -85,7 +86,7 @@ public class ScriptManagerImpl implements ScriptManager, FileWatcher { public ScriptManagerImpl(final Configuration configuration, final WatchManager watchManager) { String scriptLanguages = - PropertiesUtil.getProperties().getStringProperty(ScriptManagerFactoryImpl.SCRIPT_LANGUAGES); + PropertiesUtil.getProperties().getStringProperty(Log4jPropertyKey.SCRIPT_ENABLE_LANGUAGES); this.configuration = configuration; this.watchManager = watchManager; final List<ScriptEngineFactory> factories = manager.getEngineFactories(); diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/ScriptAppenderSelectorTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/ScriptAppenderSelectorTest.java index fc6e6a88a0..7c13407d14 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/ScriptAppenderSelectorTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/ScriptAppenderSelectorTest.java @@ -19,9 +19,9 @@ package org.apache.logging.log4j.script.appender; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; +import org.apache.logging.log4j.core.test.appender.ListAppender; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.apache.logging.log4j.spi.ExtendedLogger; -import org.apache.logging.log4j.core.test.appender.ListAppender; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledForJreRange; import org.junit.jupiter.api.condition.JRE; diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java index 5178d220fe..8cb771e446 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java @@ -16,15 +16,6 @@ */ package org.apache.logging.log4j.script.appender.rolling; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; -import org.assertj.core.api.ThrowingConsumer; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -35,6 +26,15 @@ import java.util.concurrent.locks.LockSupport; import java.util.function.LongSupplier; import java.util.stream.Stream; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; +import org.assertj.core.api.ThrowingConsumer; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -49,7 +49,7 @@ public class RollingAppenderDeleteScriptFri13thTest { @BeforeClass public static void beforeClass() { - System.setProperty(ScriptManagerFactoryImpl.SCRIPT_LANGUAGES, "Groovy, Javascript"); + System.setProperty(Log4jPropertyKey.SCRIPT_ENABLE_LANGUAGES.getSystemKey(), "Groovy, Javascript"); } @Rule diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptTest.java index 820600256c..9d9e647ad2 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/RollingAppenderDeleteScriptTest.java @@ -16,19 +16,19 @@ */ package org.apache.logging.log4j.script.appender.rolling; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.File; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * */ @@ -41,7 +41,7 @@ public class RollingAppenderDeleteScriptTest { @BeforeClass public static void beforeClass() { - System.setProperty(ScriptManagerFactoryImpl.SCRIPT_LANGUAGES, "Groovy, Javascript"); + System.setProperty(Log4jPropertyKey.SCRIPT_ENABLE_LANGUAGES.getSystemKey(), "Groovy, Javascript"); } @Rule diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/action/ScriptConditionTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/action/ScriptConditionTest.java index 81fd3726e5..35b23b6fb0 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/action/ScriptConditionTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/rolling/action/ScriptConditionTest.java @@ -14,9 +14,13 @@ * See the license for the specific language governing permissions and * limitations under the license. */ - package org.apache.logging.log4j.script.appender.rolling.action; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + import org.apache.logging.log4j.core.appender.rolling.action.PathWithAttributes; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.DefaultConfiguration; @@ -27,11 +31,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; - import static org.junit.jupiter.api.Assertions.*; /** diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/DefaultRouteScriptAppenderTest.java index 8e2be73213..9884620f84 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/DefaultRouteScriptAppenderTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/DefaultRouteScriptAppenderTest.java @@ -24,9 +24,9 @@ import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.appender.routing.RoutingAppender; import org.apache.logging.log4j.core.config.AppenderControl; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; @@ -57,7 +57,7 @@ public class DefaultRouteScriptAppenderTest { @BeforeClass public static void beforeClass() { - System.setProperty(ScriptManagerFactoryImpl.SCRIPT_LANGUAGES, "Groovy, Javascript"); + System.setProperty(Log4jPropertyKey.SCRIPT_ENABLE_LANGUAGES.getSystemKey(), "Groovy, Javascript"); } @Rule diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/RoutesScriptAppenderTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/RoutesScriptAppenderTest.java index 3502d54f75..bb17ee0a48 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/RoutesScriptAppenderTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/RoutesScriptAppenderTest.java @@ -16,6 +16,10 @@ */ package org.apache.logging.log4j.script.appender.routing; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; @@ -25,10 +29,10 @@ import org.apache.logging.log4j.core.appender.routing.Routes; import org.apache.logging.log4j.core.appender.routing.RoutingAppender; import org.apache.logging.log4j.core.config.AppenderControl; import org.apache.logging.log4j.core.impl.DefaultLogEventFactory; +import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.appender.ListAppender; import org.apache.logging.log4j.core.test.categories.Scripts; import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; @@ -37,10 +41,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -62,7 +62,7 @@ public class RoutesScriptAppenderTest { @BeforeClass public static void beforeClass() { - System.setProperty(ScriptManagerFactoryImpl.SCRIPT_LANGUAGES, "Groovy, Javascript"); + System.setProperty(Log4jPropertyKey.SCRIPT_ENABLE_LANGUAGES.getSystemKey(), "Groovy, Javascript"); } @Rule diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java index 957bde287b..10ac0fc870 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java @@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.test.appender.ListAppender; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.apache.logging.log4j.core.test.junit.Named; import org.apache.logging.log4j.core.test.junit.ReconfigurationPolicy; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; import org.apache.logging.log4j.util.Strings; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; diff --git a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootInitTest.java b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootInitTest.java index b4265ae2ca..7906c9d674 100644 --- a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootInitTest.java +++ b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootInitTest.java @@ -33,7 +33,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @SetSystemProperty(key = "spring.profiles.active", value = "prod") -@SetSystemProperty(key = LoggingSystemProperty.LOGGER_CONTEXT_FACTORY_CLASS, value = "org.apache.logging.log4j.core.impl.Log4jContextFactory") +@SetSystemProperty(key = LoggingSystemProperty.Constant.LOGGER_CONTEXT_FACTORY_CLASS, + value = "org.apache.logging.log4j.core.impl.Log4jContextFactory") @SpringBootTest public class Log4j2SpringBootInitTest { diff --git a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java index e3b7c94245..e3c74b4d47 100644 --- a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java +++ b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java @@ -16,6 +16,9 @@ */ package org.apache.logging.log4j.spring.boot; +import java.util.Arrays; +import java.util.List; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; @@ -29,9 +32,6 @@ import org.springframework.boot.logging.log4j2.Log4J2LoggingSystem; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Arrays; -import java.util.List; - public class Log4j2SpringBootLoggingSystemTest { @Test
