This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch rel-2.25.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7d2419e4afeed5d3b540c52881e961ea4e385deb Merge: 9b9a0d4350 6923bd90cb Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Sep 22 09:09:17 2025 +0200 Merge tag `rel/2.25.2` into `2.x` pom.xml | 8 +++---- .../update_com_fasterxml_jackson_jackson_bom.xml | 8 ------- .../update_org_xerial_snappy_snappy_java.xml | 8 +++++++ .../update_com_fasterxml_jackson_jackson_bom.xml | 4 ++-- src/changelog/2.25.2/.release-notes.adoc.ftl | 25 ++++++++++++++++++++++ src/changelog/2.25.2/.release.xml | 21 ++++++++++++++++++ .../2.25.2/3819_logback-builder-reuse.xml | 13 +++++++++++ .../2.25.2/3828_fix_log_placeholder_mismatch.xml | 13 +++++++++++ src/changelog/2.25.2/3835-default-layout.xml | 13 +++++++++++ src/changelog/2.25.2/3852-default-target.xml | 12 +++++++++++ .../3872_fix_RollingFileManager_initialTime.xml | 13 +++++++++++ .../2.25.2/3873_throwable_converter_new_line.xml | 13 +++++++++++ src/changelog/2.25.2/3905_fix_error_prone_dep.xml | 15 +++++++++++++ src/changelog/2.25.2/3920-nested-throwables.xml | 12 +++++++++++ src/changelog/2.25.2/3930_date-converter.xml | 13 +++++++++++ 15 files changed, 177 insertions(+), 14 deletions(-) diff --cc pom.xml index df51f7d4a0,e8770e87a5..b3c1385c7a --- a/pom.xml +++ b/pom.xml @@@ -307,11 -307,11 +307,11 @@@ <properties> <!-- project version --> - <revision>2.25.2</revision> + <revision>2.26.0-SNAPSHOT</revision> <!-- Versions used on the site: no snapshots! --> - <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> + <site-log4j-api.version>2.25.2</site-log4j-api.version> + <site-log4j-core.version>2.25.2</site-log4j-core.version> + <site-log4j-layout-template-json.version>2.25.2</site-log4j-layout-template-json.version> <!-- ================= Common properties diff --cc src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml index 9c6349dd8f,0000000000..9cee8d3e8c mode 100644,000000..100644 --- a/src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml +++ b/src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml @@@ -1,8 -1,0 +1,16 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<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"; ++<<<<<<<< HEAD:src/changelog/.2.x.x/update_org_xerial_snappy_snappy_java.xml + type="updated"> + <issue id="3841" link="https://github.com/apache/logging-log4j2/pull/3841"/> + <description format="asciidoc">Update `org.xerial.snappy:snappy-java` to version `1.1.10.8`</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> ++>>>>>>>> rel/2.25.2:src/changelog/2.25.1/3754_fix-gradle-build.xml +</entry> diff --cc src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml index 73d0af758c,73d0af758c..08757e744a --- a/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml +++ b/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml @@@ -3,6 -3,6 +3,6 @@@ 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="3708" link="https://github.com/apache/logging-log4j2/pull/3708"/> -- <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.19.0`</description> ++ <issue id="3847" link="https://github.com/apache/logging-log4j2/pull/3847"/> ++ <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version ``</description> </entry>
