Merge branch '2.25.x' into 2.x-site-pro

# Conflicts:
#	.asf.yaml

Author: ppkarwasz

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,4 @@ name: Feature request
 about: Submit a feature request
 ---
 
-**Warning!**
-It is highly recommended to discuss feature requests in [the mailing lists](https://logging.apache.org/log4j/2.x/support.html) first.
-
 [A clear and concise description of the feature requested.]

.github/dependabot.yaml

@@ -44,48 +44,17 @@ registries:
 updates:
 
   - package-ecosystem: maven
-    directories:
-      - "/log4j-1.2-api"
-      - "/log4j-api-test"
-      - "/log4j-api"
-      - "/log4j-appserver"
-      - "/log4j-cassandra"
-      - "/log4j-core-fuzz-test"
-      - "/log4j-core-its"
-      - "/log4j-core-test"
-      - "/log4j-core"
-      - "/log4j-couchdb"
-      - "/log4j-docker"
-      - "/log4j-fuzz-test"
-      - "/log4j-iostreams"
-      - "/log4j-jakarta-jms"
-      - "/log4j-jakarta-smtp"
-      - "/log4j-jakarta-web"
-      - "/log4j-jcl"
-      - "/log4j-jdbc-dbcp2"
-      - "/log4j-jpa"
-      - "/log4j-jpl"
-      - "/log4j-jul"
-      - "/log4j-layout-template-json-fuzz-test"
-      - "/log4j-layout-template-json-test"
-      - "/log4j-layout-template-json"
-      - "/log4j-mongodb"
-        # `log4j-mongodb4` is in a separate run
-      - "/log4j-osgi-test"
-      - "/log4j-parent"
-      - "/log4j-perf-test"
-        # `log4j-slf4j-impl` is in a separate run
-      - "/log4j-slf4j2-impl-fuzz-test"
-      - "/log4j-slf4j2-impl"
-      - "/log4j-spring-boot"
-      - "/log4j-spring-cloud-config-client"
-      - "/log4j-taglib"
-      - "/log4j-to-jul"
-      - "/log4j-to-slf4j"
-      - "/log4j-web"
-    open-pull-requests-limit: 10
+    directory: "/"
+    exclude-paths:
+      # These use versions of MongoDB and SLF4J different
+      # from the remaining artifacts
+      - "log4j-mongodb4/**"
+      - "log4j-slf4j-impl/**"
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "2.x"
     registries:
       - maven-central
@@ -166,9 +135,11 @@ updates:
   - package-ecosystem: maven
     directories:
       - "/log4j-mongodb4"
-    open-pull-requests-limit: 10
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "2.x"
     registries:
       - maven-central
@@ -180,20 +151,19 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: "daily"
-    target-branch: "2.x"
-
-  - package-ecosystem: npm
-    directory: "/"
-    schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "2.x"
 
   - package-ecosystem: maven
     directory: "/"
-    open-pull-requests-limit: 10
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "main"
     registries:
       - maven-central
@@ -222,9 +192,11 @@ updates:
   - package-ecosystem: maven
     directories:
       - "/log4j-slf4j-impl"
-    open-pull-requests-limit: 10
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "main"
     registries:
       - maven-central
@@ -236,11 +208,17 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "main"
 
   - package-ecosystem: npm
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
+    groups:
+      dependencies:
+        patterns: [ "*" ]
     target-branch: "main"

.github/pull_request_template.md

@@ -1,40 +1,8 @@
 **INSERT HERE** a clear and concise description of what the pull request is for along with a reference to the associated issue IDs, if they exist.
 
-> [!IMPORTANT]  
-> Base your changes on `2.x` branch if you are targeting Log4j 2; use `main` otherwise.
-
 ## Checklist
 
-Before we can review and merge your changes, please go through the checklist below. If you're still working on some items, feel free to submit your pull request as a draft—our CI will help guide you through the remaining steps.
-
-### ✅ Required checks
-
-- [ ] **License**: I confirm that my changes are submitted under the [Apache License, Version 2.0](https://apache.org/licenses/LICENSE-2.0).
-- [ ] **Commit signatures**: All commits are signed and verifiable. (See [GitHub Docs on Commit Signature Verification](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)).
-- [ ] **Code formatting**: The code is formatted according to the project’s style guide.
-  <details>
-    <summary>How to check and fix formatting</summary>
-
-    - To **check** formatting: `./mvnw spotless:check`
-    - To **fix** formatting: `./mvnw spotless:apply`
-
-    See [the build instructions](https://logging.apache.org/log4j/2.x/development.html#building) for details.
-  </details>
-- [ ] **Build & Test**: I verified that the project builds and all unit tests pass.
-  <details>
-    <summary>How to build the project</summary>
-
-    Run: `./mvnw verify`
-
-    See [the build instructions](https://logging.apache.org/log4j/2.x/development.html#building) for details.
-  </details>
-
-### 🧪 Tests (select one)
-
-- [ ] I have added or updated tests to cover my changes.
-- [ ] No additional tests are needed for this change.
-
-### 📝 Changelog (select one)
-
-- [ ] I added a changelog entry in `src/changelog/.2.x.x`. (See [Changelog Entry File Guide](https://logging.apache.org/log4j/tools/log4j-changelog.html#changelog-entry-file)).
-- [ ] This is a trivial change and does not require a changelog entry.
+* Base your changes on `2.x` branch if you are targeting Log4j 2; use `main` otherwise
+* `./mvnw verify` succeeds ([the build instructions](https://logging.apache.org/log4j/2.x/development.html#building))
+* Non-trivial changes contain an entry file in the `src/changelog/.2.x.x` directory
+* Tests are provided

.github/workflows/build.yaml

@@ -21,6 +21,7 @@ on:
   push:
     branches:
       - "2.x"
+      - "2.25.x"
       - "release/2*"
   pull_request:
 
@@ -29,7 +30,6 @@ permissions: read-all
 jobs:
 
   build:
-    if: github.actor != 'dependabot[bot]'
     uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
     secrets:
       DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}

.github/workflows/merge-dependabot.yaml

@@ -180,25 +180,25 @@ private <T extends Log4j1Configuration> Appender createAppender(
         }
         final String filePattern = fileName + "%d{" + datePattern + "}";
         final TriggeringPolicy timePolicy =
-                TimeBasedTriggeringPolicy.newBuilder().withModulate(true).build();
+                TimeBasedTriggeringPolicy.newBuilder().setModulate(true).build();
         final TriggeringPolicy policy = CompositeTriggeringPolicy.createPolicy(timePolicy);
         final RolloverStrategy strategy = DefaultRolloverStrategy.newBuilder()
-                .withConfig(configuration)
-                .withMax(Integer.toString(Integer.MAX_VALUE))
+                .setConfig(configuration)
+                .setMax(Integer.toString(Integer.MAX_VALUE))
                 .build();
         return AppenderWrapper.adapt(RollingFileAppender.newBuilder()
                 .setName(name)
                 .setConfiguration(configuration)
                 .setLayout(fileLayout)
                 .setFilter(fileFilter)
-                .withFileName(fileName)
-                .withAppend(append)
+                .setFileName(fileName)
+                .setAppend(append)
                 .setBufferedIo(bufferedIo)
                 .setBufferSize(bufferSize)
                 .setImmediateFlush(immediateFlush)
-                .withFilePattern(filePattern)
-                .withPolicy(policy)
-                .withStrategy(strategy)
+                .setFilePattern(filePattern)
+                .setPolicy(policy)
+                .setStrategy(strategy)
                 .build());
     }
 }

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java

@@ -259,7 +259,7 @@ private Appender createAppender(
         final DefaultRolloverStrategy.Builder rolloverStrategyBuilder = DefaultRolloverStrategy.newBuilder();
         switch (rollingPolicyClassName) {
             case FIXED_WINDOW_ROLLING_POLICY:
-                rolloverStrategyBuilder.withMin(Integer.toString(minIndex)).withMax(Integer.toString(maxIndex));
+                rolloverStrategyBuilder.setMin(Integer.toString(minIndex)).setMax(Integer.toString(maxIndex));
                 break;
             case TIME_BASED_ROLLING_POLICY:
                 break;
@@ -276,18 +276,18 @@ private Appender createAppender(
             return null;
         }
         return AppenderWrapper.adapt(RollingFileAppender.newBuilder()
-                .withAppend(append)
+                .setAppend(append)
                 .setBufferedIo(bufferedIo)
                 .setBufferSize(bufferedIo ? bufferSize : 0)
                 .setConfiguration(configuration)
-                .withFileName(actualFileName)
-                .withFilePattern(fileNamePattern)
+                .setFileName(actualFileName)
+                .setFilePattern(fileNamePattern)
                 .setFilter(fileFilter)
                 .setImmediateFlush(actualImmediateFlush)
                 .setLayout(fileLayout)
                 .setName(name)
-                .withPolicy(actualTriggeringPolicy)
-                .withStrategy(rolloverStrategyBuilder.build())
+                .setPolicy(actualTriggeringPolicy)
+                .setStrategy(rolloverStrategyBuilder.build())
                 .build());
     }
 }

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/EnhancedRollingFileAppenderBuilder.java

@@ -158,9 +158,9 @@ private Appender createAppender(
                 .setConfiguration(configuration)
                 .setLayout(fileLayout)
                 .setFilter(fileFilter)
-                .withFileName(fileName)
+                .setFileName(fileName)
                 .setImmediateFlush(immediateFlush)
-                .withAppend(append)
+                .setAppend(append)
                 .setBufferedIo(bufferedIo)
                 .setBufferSize(bufferSize)
                 .build());

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java

@@ -188,23 +188,23 @@ private Appender createAppender(
         final SizeBasedTriggeringPolicy sizePolicy = SizeBasedTriggeringPolicy.createPolicy(maxSize);
         final CompositeTriggeringPolicy policy = CompositeTriggeringPolicy.createPolicy(sizePolicy);
         final RolloverStrategy strategy = DefaultRolloverStrategy.newBuilder()
-                .withConfig(config)
-                .withMax(maxBackups)
-                .withFileIndex("min")
+                .setConfig(config)
+                .setMax(maxBackups)
+                .setFileIndex("min")
                 .build();
         return AppenderWrapper.adapt(RollingFileAppender.newBuilder()
                 .setName(name)
                 .setConfiguration(config)
                 .setLayout(fileLayout)
                 .setFilter(fileFilter)
-                .withAppend(append)
+                .setAppend(append)
                 .setBufferedIo(bufferedIo)
                 .setBufferSize(bufferSize)
                 .setImmediateFlush(immediateFlush)
-                .withFileName(fileName)
-                .withFilePattern(filePattern)
-                .withPolicy(policy)
-                .withStrategy(strategy)
+                .setFileName(fileName)
+                .setFilePattern(filePattern)
+                .setPolicy(policy)
+                .setStrategy(strategy)
                 .build());
     }
 }

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java

@@ -73,8 +73,8 @@ public Layout parse(final PropertiesConfiguration config) {
 
     private Layout createLayout(final String title, final boolean locationInfo) {
         return LayoutWrapper.adapt(HtmlLayout.newBuilder()
-                .withTitle(title)
-                .withLocationInfo(locationInfo)
+                .setTitle(title)
+                .setLocationInfo(locationInfo)
                 .build());
     }
 }