This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7b9d592d0382ed67f832f9e790b729ec4283121a Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Nov 16 10:40:03 2023 +0100 Organize changelog --- .../fix_MDC_pattern_converter_for_notEmpty.xml | 2 +- ...ix_reusable_message_factory_serializability.xml | 4 ++-- ...pdate_co_elastic_clients_elasticsearch_java.xml | 8 ------- src/changelog/.2.x.x/update_com_h2database_h2.xml | 8 ------- ..._flapdoodle_embed_de_flapdoodle_embed_mongo.xml | 8 ------- ...de_flapdoodle_reverse_de_flapdoodle_reverse.xml | 8 ------- .../.2.x.x/update_github_codeql_action.xml | 8 ------- .../.2.x.x/update_org_junit_junit_bom.xml | 8 ------- ..._org_spring_framework_spring_framework_bom.xml} | 6 +++--- .../update_uk_org_webcompere_system_stubs_core.xml | 8 ------- .../.2.x.x/upgrade_spring-framework-bom.xml | 25 ---------------------- src/site/_release-notes/_2.x.x.adoc | 14 +++--------- 12 files changed, 9 insertions(+), 98 deletions(-) diff --git a/src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml b/src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml index 83250de748..674ad607dc 100644 --- a/src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml +++ b/src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml @@ -2,7 +2,7 @@ <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://logging.apache.org/log4j/changelog"; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> + type="fixed"> <issue id="1922" link="https://github.com/apache/logging-log4j2/issues/1922"/> <description format="asciidoc">Fix MDC pattern converter causing issues for `%notEmpty`</description> </entry> diff --git a/src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml b/src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml index 958ec2bce5..594e055e2f 100644 --- a/src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml +++ b/src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml @@ -2,7 +2,7 @@ <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://logging.apache.org/log4j/changelog"; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> + type="fixed"> <issue id="1884" link="https://github.com/apache/logging-log4j2/issues/1884"/> - <description format="asciidoc">Fix `NotSerializableException` when `Logger` is serialized with a `ReusableMessageFactory`</description> + <description format="asciidoc">Fix `NotSerializableException` thrown when `Logger` is serialized with a `ReusableMessageFactory`</description> </entry> diff --git a/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml b/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml deleted file mode 100644 index 89666d5a8a..0000000000 --- a/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1968" link="https://github.com/apache/logging-log4j2/pull/1968"/> - <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.11.1`</description> -</entry> diff --git a/src/changelog/.2.x.x/update_com_h2database_h2.xml b/src/changelog/.2.x.x/update_com_h2database_h2.xml deleted file mode 100644 index 28211be103..0000000000 --- a/src/changelog/.2.x.x/update_com_h2database_h2.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1880" link="https://github.com/apache/logging-log4j2/pull/1880"/> - <description format="asciidoc">Update `com.h2database:h2` to version `2.2.224`</description> -</entry> diff --git a/src/changelog/.2.x.x/update_de_flapdoodle_embed_de_flapdoodle_embed_mongo.xml b/src/changelog/.2.x.x/update_de_flapdoodle_embed_de_flapdoodle_embed_mongo.xml deleted file mode 100644 index 7e1f0c2351..0000000000 --- a/src/changelog/.2.x.x/update_de_flapdoodle_embed_de_flapdoodle_embed_mongo.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1945" link="https://github.com/apache/logging-log4j2/pull/1945"/> - <description format="asciidoc">Update `de.flapdoodle.embed:de.flapdoodle.embed.mongo` to version `4.9.0`</description> -</entry> diff --git a/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml b/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml deleted file mode 100644 index 17145ccdd1..0000000000 --- a/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1965" link="https://github.com/apache/logging-log4j2/pull/1965"/> - <description format="asciidoc">Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0`</description> -</entry> diff --git a/src/changelog/.2.x.x/update_github_codeql_action.xml b/src/changelog/.2.x.x/update_github_codeql_action.xml deleted file mode 100644 index 134388dd01..0000000000 --- a/src/changelog/.2.x.x/update_github_codeql_action.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1971" link="https://github.com/apache/logging-log4j2/pull/1971"/> - <description format="asciidoc">Update `github/codeql-action` to version `2.22.6`</description> -</entry> 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 deleted file mode 100644 index 2daf49602b..0000000000 --- a/src/changelog/.2.x.x/update_org_junit_junit_bom.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1944" link="https://github.com/apache/logging-log4j2/pull/1944"/> - <description format="asciidoc">Update `org.junit:junit-bom` to version `5.10.1`</description> -</entry> diff --git a/src/changelog/.2.x.x/fix_javadoc_inheritdoc.xml b/src/changelog/.2.x.x/update_org_spring_framework_spring_framework_bom.xml similarity index 53% rename from src/changelog/.2.x.x/fix_javadoc_inheritdoc.xml rename to src/changelog/.2.x.x/update_org_spring_framework_spring_framework_bom.xml index 9105d56652..0cf4eb49b1 100644 --- a/src/changelog/.2.x.x/fix_javadoc_inheritdoc.xml +++ b/src/changelog/.2.x.x/update_org_spring_framework_spring_framework_bom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="fixed"> - <description format="asciidoc">Fix Javadoc inheritDoc tags</description> + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"; + type="changed"> + <description format="asciidoc">Update `org.springframework:spring-framework-bom` to version `5.3.30`</description> </entry> diff --git a/src/changelog/.2.x.x/update_uk_org_webcompere_system_stubs_core.xml b/src/changelog/.2.x.x/update_uk_org_webcompere_system_stubs_core.xml deleted file mode 100644 index 20b865844e..0000000000 --- a/src/changelog/.2.x.x/update_uk_org_webcompere_system_stubs_core.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; - type="changed"> - <issue id="1892" link="https://github.com/apache/logging-log4j2/pull/1892"/> - <description format="asciidoc">Update `uk.org.webcompere:system-stubs-core` to version `2.0.3`</description> -</entry> diff --git a/src/changelog/.2.x.x/upgrade_spring-framework-bom.xml b/src/changelog/.2.x.x/upgrade_spring-framework-bom.xml deleted file mode 100644 index d0541b960c..0000000000 --- a/src/changelog/.2.x.x/upgrade_spring-framework-bom.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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. - --> -<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://logging.apache.org/log4j/changelog"; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"; - type="changed"> - <description format="asciidoc"> - Update Spring Framework from version 5.3.29 to 5.3.30; - </description> -</entry> diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index bca681eb14..8f362c9176 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -47,27 +47,18 @@ The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, `log4j === Changed * Change the order of evaluation of `FormattedMessage` formatters. Messages are evaluated using `java.util.Format` only if they don't comply to the `java.text.MessageFormat` or `ParameterizedMessage` format. (https://github.com/apache/logging-log4j2/issues/1223[1223]) -* Fix MDC pattern converter causing issues for `%notEmpty` (https://github.com/apache/logging-log4j2/issues/1922[1922]) -* Fix `NotSerializableException` when `Logger` is serialized with a `ReusableMessageFactory` (https://github.com/apache/logging-log4j2/issues/1884[1884]) -* Update `co.elastic.clients:elasticsearch-java` to version `8.11.1` (https://github.com/apache/logging-log4j2/pull/1968[1968]) * Update `com.fasterxml.jackson:jackson-bom` to version `2.15.3` (https://github.com/apache/logging-log4j2/pull/1894[1894]) * Update `com.github.luben:zstd-jni` to version `1.5.5-10` (https://github.com/apache/logging-log4j2/pull/1940[1940]) * Update `com.google.guava:guava` to version `32.1.3-jre` (https://github.com/apache/logging-log4j2/pull/1875[1875]) -* Update `com.h2database:h2` to version `2.2.224` (https://github.com/apache/logging-log4j2/pull/1880[1880]) -* Update `de.flapdoodle.embed:de.flapdoodle.embed.mongo` to version `4.9.0` (https://github.com/apache/logging-log4j2/pull/1945[1945]) -* Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` (https://github.com/apache/logging-log4j2/pull/1965[1965]) -* Update `github/codeql-action` to version `2.22.6` (https://github.com/apache/logging-log4j2/pull/1971[1971]) * Update `io.netty:netty-bom` to version `4.1.101.Final` (https://github.com/apache/logging-log4j2/pull/1960[1960]) * Update `net.bytebuddy:byte-buddy` to version `1.14.9` (https://github.com/apache/logging-log4j2/pull/1891[1891]) * Update `org.eclipse.persistence:org.eclipse.persistence.jpa` to version `2.7.13` (https://github.com/apache/logging-log4j2/pull/1900[1900]) * Update `org.fusesource.jansi:jansi` to version `2.4.1` (https://github.com/apache/logging-log4j2/pull/1907[1907]) -* Update `org.junit:junit-bom` to version `5.10.1` (https://github.com/apache/logging-log4j2/pull/1944[1944]) * Update `org.mongodb:bson` to version `4.11.1` (https://github.com/apache/logging-log4j2/pull/1957[1957]) * Update `org.ow2.asm:asm-bom` to version `9.6` (https://github.com/apache/logging-log4j2/pull/1898[1898]) +* Update `org.springframework:spring-framework-bom` to version `5.3.30` * Update `org.springframework.boot:spring-boot` to version `2.7.17` (https://github.com/apache/logging-log4j2/pull/1874[1874]) * Update `org.zeromq:jeromq` to version `0.5.4` (https://github.com/apache/logging-log4j2/pull/1878[1878]) -* Update `uk.org.webcompere:system-stubs-core` to version `2.0.3` (https://github.com/apache/logging-log4j2/pull/1892[1892]) -* Update Spring Framework from version 5.3.29 to 5.3.30; === Removed @@ -75,8 +66,9 @@ The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, `log4j === Fixed +* Fix MDC pattern converter causing issues for `%notEmpty` (https://github.com/apache/logging-log4j2/issues/1922[1922]) * Export missing OSGi & JPMS modules in `log4j-layout-template-json` and `log4j-1.2-api` (https://github.com/apache/logging-log4j2/issues/1895[1895]) * Fix `spring-test` dependency scope change (https://issues.apache.org/jira/browse/LOG4J2-3675[LOG4J2-3675]) -* Fix Javadoc inheritDoc tags * Fix JPMS descriptors causing `jlink` issues (https://github.com/apache/logging-log4j2/issues/1896[1896]) * Add missing `Implementation-` and `Specification-` entries to `MANIFEST.MF` (implemented by `logging-parent` version `10.3.0` update) (https://github.com/apache/logging-log4j2/issues/1923[1923]) +* Fix `NotSerializableException` thrown when `Logger` is serialized with a `ReusableMessageFactory` (https://github.com/apache/logging-log4j2/issues/1884[1884])
