This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/apply-property-environment in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 59eeaf5e3092663ad37bdd4522073a721bd0f169 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Mar 15 10:46:52 2024 +0100 Fix `PropertiesUtil` source --- .../log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java | 2 +- .../log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java b/log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java index fc860ca81b..bf4b0344c6 100644 --- a/log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java +++ b/log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.util.PropertiesUtil; */ public class PropertiesUtilPropertyEnvironment extends BasicPropertyEnvironment { - private static final String PREFIX = "log4j2."; + private static final String PREFIX = "log4j."; public static final PropertyEnvironment INSTANCE = new PropertiesUtilPropertyEnvironment(PropertiesUtil.getProperties(), StatusLogger.getLogger()); diff --git a/log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java b/log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java index 3ec5d184e0..1af652e58a 100644 --- a/log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java +++ b/log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java @@ -33,7 +33,7 @@ class PropertiesUtilPropertyEnvironmentTest extends AbstractPropertyNamesTest { @Test @SetSystemProperty(key = "log4j2.messageFactory", value = "2.x") - @SetSystemProperty(key = "log4j2.transportSecurityKeystorePath", value = "2.x") + @SetSystemProperty(key = "log4j2.transportSecurityKeyStorePath", value = "2.x") void properties_2_x_are_recognized() { final PropertyEnvironment environment = new PropertiesUtilPropertyEnvironment(PROPERTIES_UTIL, LOGGER); assertPropertiesAreSet("2.x", environment);
