Merge branch 'apache:2.x' into 2.x

Author: alan0428a

.mvn/develocity.xml

@@ -10,14 +10,14 @@
         </obfuscation>
         <publishing>
             <onlyIf>
-                <![CDATA[authenticated]]>
+                <![CDATA[env['CI'] != null]]>
             </onlyIf>
         </publishing>
-        <backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload>
+        <backgroundBuildScanUpload>false</backgroundBuildScanUpload>
     </buildScan>
     <buildCache>
         <local>
-            <enabled>#{isFalse(env['GITHUB_ACTIONS'])}</enabled>
+            <enabled>false</enabled>
         </local>
         <remote>
             <enabled>false</enabled>

log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncThreadContextCopyOnWriteTest.java

@@ -27,14 +27,14 @@
 // ThreadContext initialization will result in static final fields being set in various components.
 // To use a different ThreadContextMap, the test needs to be run in a new JVM.
 @Tag(Tags.ASYNC_LOGGERS)
-public class AsyncThreadContextCopyOnWriteTest extends AbstractAsyncThreadContextTestBase {
+class AsyncThreadContextCopyOnWriteTest extends AbstractAsyncThreadContextTestBase {
 
     @TempLoggingDir
     private static Path loggingPath;
 
     @ParameterizedTest
     @EnumSource
-    public void testAsyncLogWritesToLog(Mode asyncMode) throws Exception {
+    void testAsyncLogWritesToLog(Mode asyncMode) throws Exception {
         testAsyncLogWritesToLog(ContextImpl.COPY_ON_WRITE, asyncMode, loggingPath);
     }
 }

log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncThreadContextDefaultTest.java

@@ -27,14 +27,14 @@
 // ThreadContext initialization will result in static final fields being set in various components.
 // To use a different ThreadContextMap, the test needs to be run in a new JVM.
 @Tag(Tags.ASYNC_LOGGERS)
-public class AsyncThreadContextDefaultTest extends AbstractAsyncThreadContextTestBase {
+class AsyncThreadContextDefaultTest extends AbstractAsyncThreadContextTestBase {
 
     @TempLoggingDir
     private static Path loggingPath;
 
     @ParameterizedTest
     @EnumSource
-    public void testAsyncLogWritesToLog(Mode asyncMode) throws Exception {
+    void testAsyncLogWritesToLog(Mode asyncMode) throws Exception {
         testAsyncLogWritesToLog(ContextImpl.WEBAPP, asyncMode, loggingPath);
     }
 }

log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncThreadContextGarbageFreeTest.java

@@ -27,14 +27,14 @@
 // ThreadContext initialization will result in static final fields being set in various components.
 // To use a different ThreadContextMap, the test needs to be run in a new JVM.
 @Tag(Tags.ASYNC_LOGGERS)
-public class AsyncThreadContextGarbageFreeTest extends AbstractAsyncThreadContextTestBase {
+class AsyncThreadContextGarbageFreeTest extends AbstractAsyncThreadContextTestBase {
 
     @TempLoggingDir
     private static Path loggingPath;
 
     @ParameterizedTest
     @EnumSource
-    public void testAsyncLogWritesToLog(Mode asyncMode) throws Exception {
+    void testAsyncLogWritesToLog(final Mode asyncMode) throws Exception {
         testAsyncLogWritesToLog(ContextImpl.GARBAGE_FREE, asyncMode, loggingPath);
     }
 }

pom.xml

@@ -320,7 +320,7 @@
     <project.build.outputTimestamp>2024-03-06T09:31:11Z</project.build.outputTimestamp>
 
     <!-- Enables Predictive Test Selection for the project -->
-    <predictive.test.selection.enabled>true</predictive.test.selection.enabled>
+    <predictive.test.selection.enabled>false</predictive.test.selection.enabled>
 
     <!-- ========================
          Site-specific properties
@@ -601,7 +601,7 @@
         <configuration>
           <forkCount>1C</forkCount>
           <reuseForks>false</reuseForks>
-          <runOrder>alphabetical</runOrder>
+          <runOrder>random</runOrder>
           <systemPropertyVariables>
             <java.awt.headless>true</java.awt.headless>
           </systemPropertyVariables>