This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 2e98d4eb91 Merge test util3 package back into util
2e98d4eb91 is described below
commit 2e98d4eb9149404d96ed1b743598eaafefd60622
Author: Matt Sicker <[email protected]>
AuthorDate: Sat Nov 5 17:15:16 2022 -0500
Merge test util3 package back into util
Signed-off-by: Matt Sicker <[email protected]>
---
.../logging/log4j/{util3 => util}/CharsTest.java | 3 +--
.../logging/log4j/{util3 => util}/ClassLocator.java | 4 +---
.../log4j/{util3 => util}/ClassNameLocator.java | 4 +---
.../log4j/{util3 => util}/ConstantsTest.java | 3 +--
.../logging/log4j/util/DeserializerHelper.java | 2 --
.../EnvironmentPropertySourceSecurityManagerIT.java | 4 +---
.../EnvironmentPropertySourceTest.java | 4 +---
.../log4j/{util3 => util}/LoaderUtilTest.java | 3 +--
.../Log4jCharsetsPropertiesTest.java | 3 +--
.../{util3 => util}/PropertiesUtilOrderTest.java | 4 +---
.../log4j/{util3 => util}/PropertiesUtilTest.java | 3 +--
...PropertyFilePropertySourceSecurityManagerIT.java | 5 +----
.../log4j/{util3 => util}/ProviderUtilTest.java | 2 +-
.../{util3 => util}/ServiceLoaderUtilTest.java | 14 ++++++--------
.../{util3 => util}/SortedArrayStringMapTest.java | 21 ++++-----------------
.../log4j/{util3 => util}/StackLocatorUtilTest.java | 13 +++++--------
.../log4j/{util3 => util}/StringBuildersTest.java | 7 +++----
...emPropertiesPropertySourceSecurityManagerIT.java | 4 +---
.../SystemPropertiesPropertySourceTest.java | 5 ++---
19 files changed, 33 insertions(+), 75 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/CharsTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/CharsTest.java
similarity index 96%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/CharsTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/CharsTest.java
index ab99dd0ead..b3cfe64ab0 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/CharsTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/CharsTest.java
@@ -14,9 +14,8 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.Chars;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassLocator.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassLocator.java
similarity index 91%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassLocator.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassLocator.java
index f9bd074df5..9e94d0ab4c 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassLocator.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassLocator.java
@@ -14,9 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
-
-import org.apache.logging.log4j.util.StackLocatorUtil;
+package org.apache.logging.log4j.util;
/**
* Created by rgoers on 3/15/17.
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassNameLocator.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassNameLocator.java
similarity index 91%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassNameLocator.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassNameLocator.java
index 80c8e68ecb..0a7d48fbc8 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ClassNameLocator.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ClassNameLocator.java
@@ -14,9 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
-
-import org.apache.logging.log4j.util.StackLocatorUtil;
+package org.apache.logging.log4j.util;
/**
*
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ConstantsTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ConstantsTest.java
similarity index 93%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ConstantsTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ConstantsTest.java
index 31c0d9c5be..0c028b898f 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ConstantsTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ConstantsTest.java
@@ -14,9 +14,8 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.Constants;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
index 27ba3a4742..31030d3d75 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util3.SortedArrayStringMapTest;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.ObjectInputStream;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceSecurityManagerIT.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java
similarity index 95%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceSecurityManagerIT.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java
index 8e7739f069..eebb0a73aa 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceSecurityManagerIT.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java
@@ -15,10 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.EnvironmentPropertySource;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceTest.java
similarity index 92%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceTest.java
index 6a32781619..246f322fa5 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/EnvironmentPropertySourceTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceTest.java
@@ -14,10 +14,8 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.EnvironmentPropertySource;
-import org.apache.logging.log4j.util.PropertySource;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/LoaderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilTest.java
similarity index 95%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/LoaderUtilTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilTest.java
index c92610b6a9..675c54f33e 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/LoaderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/LoaderUtilTest.java
@@ -14,9 +14,8 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.LoaderUtil;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/Log4jCharsetsPropertiesTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
similarity index 95%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/Log4jCharsetsPropertiesTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
index 2aa8c70bdb..5666fa321d 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/Log4jCharsetsPropertiesTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
@@ -15,9 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.Test;
import java.nio.charset.Charset;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilOrderTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
similarity index 98%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilOrderTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
index 1594d430be..e5ffe14345 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilOrderTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java
@@ -15,10 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.PropertiesUtil;
-import org.apache.logging.log4j.util.PropertySource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
similarity index 98%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
index cedb39ba40..54192e2348 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertiesUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
@@ -15,9 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceAccessMode;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertyFilePropertySourceSecurityManagerIT.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java
similarity index 93%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertyFilePropertySourceSecurityManagerIT.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java
index f5eac92c7d..40cdcb611f 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/PropertyFilePropertySourceSecurityManagerIT.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java
@@ -15,11 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.PropertiesUtil;
-import org.apache.logging.log4j.util.PropertyFilePropertySource;
-import org.apache.logging.log4j.util.SystemPropertiesPropertySource;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ProviderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
similarity index 97%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ProviderUtilTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
index d397dd6e60..ad6d53d5d1 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ProviderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.spi.LoggerContext;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ServiceLoaderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
similarity index 94%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ServiceLoaderUtilTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
index 0f42e064ac..57353829ee 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/ServiceLoaderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
@@ -14,10 +14,11 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.logging.log4j.test.BetterService;
+import org.apache.logging.log4j.test.Service;
+import org.junit.jupiter.api.Test;
import java.lang.invoke.MethodHandles;
import java.util.Collections;
@@ -25,11 +26,8 @@ import java.util.List;
import java.util.ServiceConfigurationError;
import java.util.stream.Collectors;
-import org.apache.logging.log4j.test.BetterService;
-import org.apache.logging.log4j.test.Service;
-import org.apache.logging.log4j.util.PropertySource;
-import org.apache.logging.log4j.util.ServiceLoaderUtil;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class ServiceLoaderUtilTest {
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SortedArrayStringMapTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
similarity index 98%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SortedArrayStringMapTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
index 6a8a04e736..684f6bb473 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SortedArrayStringMapTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
@@ -14,17 +14,9 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
-
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+package org.apache.logging.log4j.util;
+
+import org.junit.jupiter.api.Test;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -44,12 +36,7 @@ import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.logging.log4j.util.BiConsumer;
-import org.apache.logging.log4j.util.DeserializerHelper;
-import org.apache.logging.log4j.util.FilteredObjectInputStream;
-import org.apache.logging.log4j.util.TriConsumer;
-import org.apache.logging.log4j.util.SortedArrayStringMap;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Tests the SortedArrayStringMap class.
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StackLocatorUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
similarity index 94%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StackLocatorUtilTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
index a68fa7dc15..96878ece8a 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StackLocatorUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java
@@ -14,19 +14,16 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker;
+import org.junit.jupiter.engine.execution.InvocationInterceptorChain;
import java.util.ArrayDeque;
import java.util.Deque;
-import org.apache.logging.log4j.util.StackLocatorUtil;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker;
-import org.junit.jupiter.engine.execution.InvocationInterceptorChain;
+import static org.junit.jupiter.api.Assertions.*;
public class StackLocatorUtilTest {
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StringBuildersTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
similarity index 94%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StringBuildersTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
index ecbd6ade9b..eb759f25eb 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/StringBuildersTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
@@ -14,13 +14,12 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.Constants;
-import org.apache.logging.log4j.util.StringBuilders;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the StringBuilders class.
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceSecurityManagerIT.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
similarity index 95%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceSecurityManagerIT.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
index bbf313eca4..d4df643cf2 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceSecurityManagerIT.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
@@ -15,10 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.PropertiesUtil;
-import org.apache.logging.log4j.util.SystemPropertiesPropertySource;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
similarity index 90%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceTest.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
index 2c6ea24c40..bd06806b8a 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util3/SystemPropertiesPropertySourceTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
@@ -15,9 +15,8 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.util3;
+package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.util.SystemPropertiesPropertySource;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.WritesSystemProperty;
@@ -44,7 +43,7 @@ public class SystemPropertiesPropertySourceTest {
* java.util.ConcurrentModificationException
* at java.util.Hashtable$Enumerator.next(Hashtable.java:1167)
* at
org.apache.logging.log4j.util.SystemPropertiesPropertySource.forEach(SystemPropertiesPropertySource.java:38)
- * at
org.apache.logging.log4j.util3.SystemPropertiesPropertySourceTest.testMultiThreadedAccess(SystemPropertiesPropertySourceTest.java:47)
+ * at
org.apache.logging.log4j.util.SystemPropertiesPropertySourceTest.testMultiThreadedAccess(SystemPropertiesPropertySourceTest.java:47)
* </pre>
* @throws InterruptedException
* @throws ExecutionException
