Merge release 2.25.1 back into 2.x (#3820)

ppkarwasz · web-flow · commit a501f98cb126 · 2025-07-20T19:38:55.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -309,9 +309,9 @@
     <!-- project version -->
     <revision>2.26.0-SNAPSHOT</revision>
     <!-- Versions used on the site: no snapshots! -->
-    <site-log4j-api.version>2.25.0</site-log4j-api.version>
-    <site-log4j-core.version>2.25.0</site-log4j-core.version>
-    <site-log4j-layout-template-json.version>2.25.0</site-log4j-layout-template-json.version>
+    <site-log4j-api.version>2.25.1</site-log4j-api.version>
+    <site-log4j-core.version>2.25.1</site-log4j-core.version>
+    <site-log4j-layout-template-json.version>2.25.1</site-log4j-layout-template-json.version>
 
     <!-- =================
          Common properties
@@ -325,7 +325,7 @@
          2. This value is employed in various places while creating the distribution
          To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
          Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-    <project.build.outputTimestamp>2025-06-13T17:08:55Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-07-05T19:48:56Z</project.build.outputTimestamp>
 
     <!-- ========================
          Site-specific properties
diff --git a/src/changelog/.2.x.x/3758_fix_jspecify_dep.xml b/src/changelog/.2.x.x/3758_fix_jspecify_dep.xml
diff --git a/src/changelog/.2.x.x/3787_jakarta-web_relax_the_import_package_constraints.xml b/src/changelog/.2.x.x/3787_jakarta-web_relax_the_import_package_constraints.xml
diff --git a/src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml b/src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml
diff --git a/src/changelog/.2.x.x/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml b/src/changelog/.2.x.x/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
diff --git a/src/changelog/.2.x.x/update_org_junit_junit_bom.xml b/src/changelog/.2.x.x/update_org_junit_junit_bom.xml
diff --git a/src/changelog/2.25.1/.release-notes.adoc.ftl b/src/changelog/2.25.1/.release-notes.adoc.ftl
@@ -0,0 +1,30 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+[${'#release-notes-' + release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This patch release addresses a dozen bugs in version `2.25.0`, in particular:
+
+* Resolves a concurrency issue in the new unified datetime formatter.
+* Fixes build failures affecting Gradle users.
+* Restores backward compatibility with Spring Boot’s common logging configuration.
+* Improves handling of edge cases in GraalVM support.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.25.1/.release.xml b/src/changelog/2.25.1/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<release xmlns="https://logging.apache.org/xml/ns"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+         date="2025-07-05" version="2.25.1"/>
diff --git a/src/changelog/2.25.1/3706_disruptor-tccl.xml b/src/changelog/2.25.1/3706_disruptor-tccl.xml
@@ -7,6 +7,6 @@
        type="fixed">
   <issue id="3706" link="https://github.com/apache/logging-log4j2/issues/3706"/>
   <description format="asciidoc">
-    Fix detection of the Disruptor major version in some environments.
+    Fix detection of the Disruptor major version in environments with non-standard thread context classloader.
   </description>
 </entry>
diff --git a/src/changelog/2.25.1/3754_fix-gradle-build.xml b/src/changelog/2.25.1/3754_fix-gradle-build.xml
@@ -2,7 +2,9 @@
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
-       type="updated">
-  <issue id="3767" link="https://github.com/apache/logging-log4j2/pull/3767"/>
-  <description format="asciidoc">Update `org.xmlunit:xmlunit-core` to version `2.10.3`</description>
+       type="fixed">
+  <issue id="3754" link="https://github.com/apache/logging-log4j2/issues/3754"/>
+  <description format="asciidoc">
+    Downgrade `spotbugs-annotations` to resolve Gradle build failures.
+  </description>
 </entry>
diff --git a/src/changelog/2.25.1/3758_fix_jspecify_dep.xml b/src/changelog/2.25.1/3758_fix_jspecify_dep.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           https://logging.apache.org/xml/ns
+           https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3758" link="https://github.com/apache/logging-log4j2/issues/3758"/>
+  <issue id="3779" link="https://github.com/apache/logging-log4j2/issues/3779"/>
+  <description format="asciidoc">
+    Fix incorrect version resolution of `jspecify` and `error_prone_annotations` dependencies in published POM files.
+  </description>
+</entry>
diff --git a/src/changelog/2.25.1/3770_LoggerContext_start.xml b/src/changelog/2.25.1/3770_LoggerContext_start.xml
@@ -7,6 +7,6 @@
        type="fixed">
   <issue id="3770" link="https://github.com/apache/logging-log4j2/issues/3770"/>
   <description format="asciidoc">
-    Restore backward compatibility with the Spring Boot reconfiguration process.
+    Restore compatibility with Spring Boot by allowing reconfiguration using the `LoggerContext.start` method.
   </description>
 </entry>
diff --git a/src/changelog/2.25.1/3771_graalvm-params.xml b/src/changelog/2.25.1/3771_graalvm-params.xml
@@ -2,9 +2,9 @@
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
-       type="changed">
+       type="fixed">
   <issue id="3771" link="https://github.com/apache/logging-log4j2/issues/3771"/>
   <description format="asciidoc">
-    Make `-Alog4j.graalvm.groupId` and `-Alog4j.graalvm.artifactId` arguments optional.
+    Allow omission of the `-Alog4j.graalvm.groupId` and `-Alog4j.graalvm.artifactId` arguments when building Log4j plugins.
   </description>
 </entry>
diff --git a/src/changelog/2.25.1/3787_jakarta-web_relax_the_import_package_constraints.xml b/src/changelog/2.25.1/3787_jakarta-web_relax_the_import_package_constraints.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           https://logging.apache.org/xml/ns
+           https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3787" link="https://github.com/apache/logging-log4j2/issues/3787"/>
+  <description format="asciidoc">
+    Broaden the OSGi manifest's `Import-Package` constraints to support Jakarta Servlet API up to version 6.
+  </description>
+</entry>
diff --git a/src/changelog/2.25.1/3790_allow-resource-protocol.xml b/src/changelog/2.25.1/3790_allow-resource-protocol.xml
@@ -7,6 +7,6 @@
        type="fixed">
   <issue id="3790" link="https://github.com/apache/logging-log4j2/issues/3790"/>
   <description format="asciidoc">
-    Allow `resource:` protocol for configuration files by default, if the current runtime is GraalVM.
+    Enable the `resource:` protocol for configuration files by default when running on GraalVM.
   </description>
 </entry>
diff --git a/src/changelog/2.25.1/3792_formatted-datetime-sharing.xml b/src/changelog/2.25.1/3792_formatted-datetime-sharing.xml
diff --git a/src/changelog/2.25.1/3796_annotated-array-parameters.xml b/src/changelog/2.25.1/3796_annotated-array-parameters.xml
@@ -5,8 +5,9 @@
            https://logging.apache.org/xml/ns
            https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="fixed">
-    <issue id="3796" link="https://github.com/apache/logging-log4j2/issues/3796"/>
-    <description format="asciidoc">
-        Fix GraalVM reachability metadata generation for methods with annotated array type parameters, such as `@Nullable String[]`.
-    </description>
+  <issue id="3796" link="https://github.com/apache/logging-log4j2/issues/3796"/>
+  <description format="asciidoc">
+    Fix GraalVM reachability metadata generation for methods with annotated array type parameters, such as `@Nullable
+    String[]`.
+  </description>
 </entry>
diff --git a/src/changelog/2.25.1/3800_graalvm-misc-reflection.xml b/src/changelog/2.25.1/3800_graalvm-misc-reflection.xml
@@ -7,6 +7,6 @@
        type="fixed">
   <issue id="3800" link="https://github.com/apache/logging-log4j2/pull/3800"/>
   <description format="asciidoc">
-    Resolves `PropertiesConfiguration` compatibility issues with GraalVM and addresses additional minor reflection-related problems.
+    Resolve `PropertiesConfiguration` compatibility issues with GraalVM and address additional minor reflection-related problems.
   </description>
 </entry>
