This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/2.21.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b0413d5bc786b665f5f360b0f63c105d16001f97 Merge: 7f5db1ba98 a51955359a Author: Volkan Yazıcı <[email protected]> AuthorDate: Fri Oct 6 09:57:24 2023 +0200 Merge remote-tracking branch 'origin/release/2.21.0' into release/2.21.0 .../JdbcAppenderColumnMappingPropertiesTest.java | 66 ++++++++++++++++ ...cAppenderColumnMappingPropertiesTest.properties | 31 ++++++++ .../log4j/core/appender/db/ColumnMapping.java | 48 +++++++++--- .../core/appender/db/jdbc/JdbcDatabaseManager.java | 7 +- .../log4j/web/Log4jServletContextListener.java | 70 ++++++++++++----- .../log4j/web/Log4jServletContextListenerTest.java | 89 ++++++++++++++-------- .../log4j/web/Log4jServletContextListener.java | 70 ++++++++++++----- .../log4j/web/Log4jServletContextListenerTest.java | 89 ++++++++++++++-------- osv-scanner.toml | 34 +++++++++ pom.xml | 2 +- .../1405_column_mapping_rename_type_attribute.xml | 27 +++++++ ...w_multiple_servletcontextlistener_instances.xml | 28 +++++++ .../.2.x.x/update-1runtime-angus-activation.xml | 27 +++++++ .../.2.x.x/update-1runtime-angus-mail.xml | 27 +++++++ .../.2.x.x/update-1runtime-cassandra-driver.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-cassandra.xml | 27 +++++++ .../.2.x.x/update-1runtime-commons-compress.xml | 27 +++++++ .../.2.x.x/update-1runtime-commons-csv.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-jackson.xml | 27 +++++++ .../.2.x.x/update-1runtime-jakarta-activation.xml | 27 +++++++ .../.2.x.x/update-1runtime-jakarta-mail.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-jctools.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-kafka.xml | 27 +++++++ .../.2.x.x/update-1runtime-kubernetes.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-mongodb.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-netty.xml | 27 +++++++ .../.2.x.x/update-1runtime-spring-boot.xml | 27 +++++++ .../.2.x.x/update-1runtime-spring-framework.xml | 27 +++++++ .../.2.x.x/update-1runtime-tomcat-juli.xml | 27 +++++++ src/changelog/.2.x.x/update-1runtime-woodstox.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-asciidoctor.xml | 27 +++++++ .../.2.x.x/update-2build-build-helper.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-dependency.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-docker.xml | 27 +++++++ .../.2.x.x/update-2build-log4j-changelog.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-scm.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-spotbugs.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-surefire.xml | 27 +++++++ src/changelog/.2.x.x/update-2build-xml.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-activemq.xml | 27 +++++++ .../update-3test-allocation-instrumenter.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-assertj.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-commons-lang.xml | 27 +++++++ .../.2.x.x/update-3test-elasticsearch.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-flapdoodle.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-groovy.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-guava.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-h2.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-hsqldb.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-jetty.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-jmh.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-jsonunit.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-junit.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-logback.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-maven.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-webcompere.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-wiremock.xml | 27 +++++++ src/changelog/.2.x.x/update-3test-xmlunit.xml | 27 +++++++ src/site/_release-notes/_2.x.x.adoc | 48 ++++++++++++ src/site/resources/release-notes/index.html | 28 +++++++ src/site/site.xml | 2 +- 61 files changed, 1767 insertions(+), 114 deletions(-) diff --cc src/site/_release-notes/_2.x.x.adoc index 53d0d577dd,88c8651c96..1fd8f67dfc --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@@ -60,9 -59,8 +60,54 @@@ For complete information on Apache Log4 * Bumped the minimum Java version required for the build to JDK 11. Runtime requirements remain unchanged. (https://github.com/apache/logging-log4j2/issues/1369[1369]) * Set the default `minLevel` and `maxLevel` of `LevelRangeFilter` to `OFF` and `ALL`, respectively (https://github.com/apache/logging-log4j2/pull/1503[1503]) * Removed additional `isFiltered` checks in `AsyncLoggerConfig` (https://github.com/apache/logging-log4j2/pull/1550[1550]) +* Use Java version-specific warnings in `StackLocator` (https://github.com/apache/logging-log4j2/pull/1760[1760]) * Started logging a status error event instead of an NPE in `OsgiServiceLocator.loadServices(Class, Lookup, boolean)` when a bundle has no valid `BundleContext` for a service type * Implemented a CI-based release process ++* Runtime dependencies: update Eclipse Angus Activation from version 2.0.0 to version link:https://github.com/eclipse-ee4j/angus-activation/releases/tag/2.0.1[2.0.1]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Eclipse Angus Mail from version 2.0.1 to version link:https://github.com/eclipse-ee4j/angus-mail/releases/tag/2.0.2[2.0.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: `com.datastax.cassandra:cassandra-driver-core` to version 3.11.5. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Apache Cassandra from version 3.11.14 to version link:https://github.com/apache/cassandra/blob/cassandra-3.11/CHANGES.txt[3.11.16]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Apache Commons Compress from version 1.22 to version link:https://commons.apache.org/proper/commons-compress/changes-report.html#a1.24.0[1.24.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Apache Commons CSV from version 1.9.0 to version link:https://commons.apache.org/proper/commons-csv/changes-report.html#a1.10.0[1.10.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Jackson from version 2.14.1 to version link:https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.15.2[2.15.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Jakarta Activation API from version 2.1.1 to version link:https://jakarta.ee/specifications/activation/2.1/changelog/[2.1.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Jakarta Mail API from version 2.1.1 to version link:https://jakarta.ee/specifications/mail/2.1/changelog/[2.1.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update JCTools from version 3.3.0 to version link:https://github.com/JCTools/JCTools/blob/master/RELEASE-NOTES.md[4.0.1]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Apache Kafka from version 1.1.1 to version link:https://archive.apache.org/dist/kafka/3.4.0/RELEASE_NOTES.html[3.4.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Kubernetes client from version 5.12.2 to version link:https://github.com/fabric8io/kubernetes-client/releases?q=5.12.4[5.12.4]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update `org.mongodb:mongodb-driver-core` to version 4.10.2. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update `io.netty:netty-bom` to version 4.1.97. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Spring Boot from version 2.7.7 to version link:https://github.com/spring-projects/spring-boot/releases/tag/v2.7.15[2.7.15]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Spring Framework from version 5.3.24 to version link:https://github.com/spring-projects/spring-framework/releases/tag/v5.3.29[5.3.29]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Tomcat JULI from version 10.0.23 to version 10.0.27. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update Woodstox from version 6.4.0 to version link:https://github.com/FasterXML/woodstox/blob/master/release-notes/VERSION[6.5.1]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `maven-asciidoctor-plugin` from version 2.2.2 to link:https://github.com/asciidoctor/asciidoctor-maven-plugin/releases/tag/asciidoctor-maven-plugin-2.2.4[2.2.4]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `build-helper-maven-plugin` from version 3.3.0 to link:https://github.com/mojohaus/build-helper-maven-plugin/releases/tag/3.4.0[3.4.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `maven-dependency-plugin` from version 3.3.0 to link:https://blogsarchive.apache.org/maven/entry/apache-maven-dependency-plugin-version4[3.5.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `docker-maven-plugin` from version 0.40.2 to link:https://github.com/fabric8io/docker-maven-plugin/releases/tag/v0.43.2[0.43.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `log4j-changelog` from version 0.2.0 to link:https://github.com/apache/logging-log4j-tools/releases/tag/rel%2F0.3.0[0.3.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `maven-scm-plugin` from version 1.12.2 to 1.13.0. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `spotbugs-maven-plugin` from version 4.7.2.1 to link:https://github.com/spotbugs/spotbugs-maven-plugin/releases/tag/spotbugs-maven-plugin-4.7.3.5[4.7.3.5]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `maven-surefire-plugin` from version 3.0.0-M7 to link:https://github.com/apache/maven-surefire/releases/tag/surefire-3.1.2[3.1.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Build dependencies: update `xml-maven-plugin` from version 1.0.2 to link:https://github.com/mojohaus/xml-maven-plugin/releases/tag/1.1.0[1.1.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Apache ActiveMQ from version 5.17.3 to version 5.17.4. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Allocation Instrumenter from version 3.3.0 to version link:https://github.com/google/allocation-instrumenter/releases/tag/java-allocation-instrumenter-3.3.3[3.3.3]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update AssertJ from version 3.23.1 to version 3.24.2. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Runtime dependencies: update `org.apache.commons:commons-lang3` to version 3.13.0. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Elasticsearch HLRC from version 7.17.8 to version link:https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.13.html[7.17.13]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Groovy from version 3.0.14 to version link:https://groovy-lang.org/changelogs/changelog-3.0.19.html[3.0.19]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Guava from version 31.1 to version link:https://github.com/google/guava/releases/tag/v32.1.2[32.1.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update H2 from version 2.1.214 to version link:http://www.h2database.com/html/changelog.html[2.2.222]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies (**security**): update HyperSQL DB from version 2.5.2 to version link:https://hsqldb.org/doc/2.0/changelist_2_0.txt[2.7.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Jetty from version 9.4.50 to version link:https://github.com/eclipse/jetty.project/releases?q=9.4.52[9.4.52]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update JMH from version 1.36 to version 1.37. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update link:https://github.com/lukas-krecan/JsonUnit[JsonUnit] from version 2.36.0 to version 2.38.0. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update JUnit from version 5.9.1 to version link:https://junit.org/junit5/docs/5.10.0/release-notes/[5.10.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Logback from version 1.2.11 to version link:https://logback.qos.ch/news.html#1.2.12[1.2.12]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update Apache Maven from version 3.8.6 to version link:https://maven.apache.org/docs/3.9.0/release-notes.html[3.9.0]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update WebCompere System Stubs from version 2.0.1 to version link:https://github.com/webcompere/system-stubs/releases/tag/system-stubs-parent-2.0.2[2.0.2]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update `com.github.tomakehurst:wiremock-jre8` to version 2.35.1. (https://github.com/apache/logging-log4j2/issues/1591[1591]) ++* Test dependencies: update XMLUnit from version 2.9.0 to version link:https://github.com/xmlunit/xmlunit/releases/tag/v2.9.1[2.9.1]. (https://github.com/apache/logging-log4j2/issues/1591[1591]) === Removed @@@ -80,11 -78,7 +125,12 @@@ * Avoided using released objects in `StackTraceStringResolver` of `JsonTemplateLayout` (https://github.com/apache/logging-log4j2/pull/1380[1380]) * Added missing setter for `connectionStringSource` in `MongoDb4Provider` builder (https://github.com/apache/logging-log4j2/issues/1389[1389]) * Fixed NPE in `PluginElementVisitor` (https://github.com/apache/logging-log4j2/issues/1391[1391]) ++* Add `columnType` as alias for the column mapping `type` attribute. (https://github.com/apache/logging-log4j2/issues/1405[1405]) +* Restored `Log4jMarker` visibility in SLF4J adapters (https://github.com/apache/logging-log4j2/issues/1414[1414]) * Fixed buffer size in `Log4jFixedFormatter` date time formatter (https://github.com/apache/logging-log4j2/pull/1418[1418]) +* Fixed the propagation of synchronous action failures in `RollingFileManager` and `FileRenameAction` (https://github.com/apache/logging-log4j2/issues/1445[1445], https://github.com/apache/logging-log4j2/pull/1549[1549]) +* Fixed `RollingFileManager` to propagate failed synchronous actions correctly. (https://github.com/apache/logging-log4j2/issues/1445[1445]) +* Replaced the usage of `System.out` in `StackLocator` for warnings with `System.err` (https://github.com/apache/logging-log4j2/issues/1484[1484]) * Fixed concurrent date-time formatting issue in `PatternLayout` (https://github.com/apache/logging-log4j2/issues/1485[1485]) * Fixed runtime dependencies documentation (https://github.com/apache/logging-log4j2/pull/1530[1530]) * Allowed to override FQCN in `Log4jEventBuilder` by implementing `CallerBoundaryAware` (https://github.com/apache/logging-log4j2/pull/1533[1533]) @@@ -96,6 -90,6 +142,7 @@@ * Removed incorrect mention of `base64` lookup and improve the rest of the lookup manual (https://github.com/apache/logging-log4j2/issues/1681[1681], https://issues.apache.org/jira/browse/LOG4J2-3504[LOG4J2-3504]) * Implemented `LocationAware` for `JsonTemplateLayout`, since this was causing location not being passed to underlying appenders (https://github.com/apache/logging-log4j2/issues/1692[1692]) * Added support for `long` values in MongoDb 4 appender to configure `collectionSize` (https://github.com/apache/logging-log4j2/issues/1747[1747]) ++* Only shutdown Log4j after last `Log4jServletContextListener` is executed. (https://github.com/apache/logging-log4j2/issues/1782[1782]) * Fixed context data loss if `<AsyncLogger>` components are used with an all async logger context (https://github.com/apache/logging-log4j2/issues/1786[1786]) * Fixed `JsonTemplateLayout` NPE thrown on custom log levels (https://github.com/apache/logging-log4j2/issues/1805[1805]) * Improved `Log4j-config.xsd` schema (https://issues.apache.org/jira/browse/LOG4J2-170[LOG4J2-170]) @@@ -104,3 -98,3 +151,4 @@@ * Fixed `%notEmpty` directive of `PatternLayout` for empty MDC/NDC inputs (https://issues.apache.org/jira/browse/LOG4J2-3660[LOG4J2-3660]) * Fixed file descriptor leak on Tomcat (https://issues.apache.org/jira/browse/LOG4J2-3663[LOG4J2-3663]) * Ensured `FileOutputStream` is closed in `CommonsCompressAction.execute()` ++* Test dependencies: update Flapdoodle Embedded MongoDB from version 3.5.1 to version 4.7.1. (https://github.com/apache/logging-log4j2/issues/1589[1589]) diff --cc src/site/resources/release-notes/index.html index 0000000000,0000000000..a4a932daed new file mode 100644 --- /dev/null +++ b/src/site/resources/release-notes/index.html @@@ -1,0 -1,0 +1,28 @@@ ++<!DOCTYPE html> ++<!-- ++ 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. ++--> ++<html lang="en"> ++<head> ++ <title>Apache Log4j Release Notes</title> ++ <!-- Log4j 2.21.0 removed the `/release-notes/index.html` in favor of `/release-notes.html`. ++ We have this HTML-based redirect here to continue support these old URLs. --> ++ <meta http-equiv="refresh" content="0; url=../release-notes.html"/> ++</head> ++<body> ++<p>You will be redirected to <a href="../release-notes.html">the release notes page</a>.</p> ++</body> ++</html> diff --cc src/site/site.xml index 9097061c5e,9097061c5e..c84a24db36 --- a/src/site/site.xml +++ b/src/site/site.xml @@@ -55,7 -55,7 +55,7 @@@ <item name="Optional Components" href="/maven-artifacts.html#Optional_Components" /> <item name="Snapshot builds" href="/maven-artifacts.html#Snapshot_builds" /> </item> -- <item name="Release Notes" href="/release-notes/index.html"/> ++ <item name="Release Notes" href="/release-notes.html"/> <item name="FAQ" href="/faq.html"/> <item name="Performance" href="/performance.html" collapse="true"> <item name="Benchmarks" href="/performance.html#benchmarks" />
