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 fad3afd2c2b0836b58fedbbad47d2c5d38e5248c Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Oct 31 12:52:58 2023 +0100 Remove redundant changelog entries --- src/changelog/.2.x.x/update_actions_checkout.xml | 8 -------- .../.2.x.x/update_co_elastic_clients_elasticsearch_java.xml | 8 -------- src/changelog/.2.x.x/update_github_codeql_action.xml | 8 -------- src/changelog/.2.x.x/update_ossf_scorecard_action.xml | 8 -------- src/site/_release-notes/_2.x.x.adoc | 4 ---- 5 files changed, 36 deletions(-) diff --git a/src/changelog/.2.x.x/update_actions_checkout.xml b/src/changelog/.2.x.x/update_actions_checkout.xml deleted file mode 100644 index ce47bd7c08..0000000000 --- a/src/changelog/.2.x.x/update_actions_checkout.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="1868" link="https://github.com/apache/logging-log4j2/pull/1868"/> - <description format="asciidoc">Update `actions/checkout` to version `4.1.1`</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 46e95a9e7d..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="1881" link="https://github.com/apache/logging-log4j2/pull/1881"/> - <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.10.4`</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 ae97a8ce07..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="1911" link="https://github.com/apache/logging-log4j2/pull/1911"/> - <description format="asciidoc">Update `github/codeql-action` to version `2.22.5`</description> -</entry> diff --git a/src/changelog/.2.x.x/update_ossf_scorecard_action.xml b/src/changelog/.2.x.x/update_ossf_scorecard_action.xml deleted file mode 100644 index 25f571f8fe..0000000000 --- a/src/changelog/.2.x.x/update_ossf_scorecard_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="1897" link="https://github.com/apache/logging-log4j2/pull/1897"/> - <description format="asciidoc">Update `ossf/scorecard-action` to version `2.3.1`</description> -</entry> diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index 3d82503014..6fbbdbc896 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -48,13 +48,10 @@ The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, `log4j * 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 `NotSerializableException` when `Logger` is serialized with a `ReusableMessageFactory`. (https://github.com/apache/logging-log4j2/issues/1884[1884]) -* Update `actions/checkout` to version `4.1.1` (https://github.com/apache/logging-log4j2/pull/1868[1868]) -* Update `co.elastic.clients:elasticsearch-java` to version `8.10.4` (https://github.com/apache/logging-log4j2/pull/1881[1881]) * 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-7` (https://github.com/apache/logging-log4j2/pull/1919[1919]) * 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 `github/codeql-action` to version `2.22.5` (https://github.com/apache/logging-log4j2/pull/1911[1911]) * Update `io.netty:netty-bom` to version `4.1.100.Final` (https://github.com/apache/logging-log4j2/pull/1857[1857]) * 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]) @@ -63,7 +60,6 @@ The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, `log4j * Update `org.ow2.asm:asm-bom` to version `9.6` (https://github.com/apache/logging-log4j2/pull/1898[1898]) * 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 `ossf/scorecard-action` to version `2.3.1` (https://github.com/apache/logging-log4j2/pull/1897[1897]) * 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;
