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 1ff33dcf2013c35e22cecc20c5af970bb2702a74
Merge: 1562452fae c4e6d297ff
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Oct 5 09:53:24 2023 +0200

    Merge remote-tracking branch 'origin/2.x' into release/2.21.0

 .github/workflows/codeql-analysis.yml              |  2 +-
 log4j-1.2-api/bnd.bnd                              | 27 ++++++++++++++++++++++
 log4j-1.2-api/pom.xml                              |  5 +---
 .../java/org/apache/log4j/config/package-info.java |  4 ++--
 log4j-api-java9/pom.xml                            |  6 +++++
 log4j-api-test/pom.xml                             | 10 ++++----
 log4j-cassandra/pom.xml                            |  5 ++--
 .../log4j/core/async/AsyncLoggerConfigTest.java    |  2 +-
 log4j-core/pom.xml                                 | 22 ++++++++++--------
 log4j-couchdb/pom.xml                              |  4 ++++
 log4j-flume-ng/pom.xml                             |  4 ++++
 log4j-jcl/pom.xml                                  |  4 ++--
 log4j-jpl/pom.xml                                  |  6 +++++
 log4j-kubernetes/pom.xml                           |  6 ++---
 log4j-mongodb3/pom.xml                             |  4 ++--
 .../log4j-spring-cloud-config-client/pom.xml       |  4 ++--
 log4j-taglib/pom.xml                               |  6 ++---
 log4j-web/pom.xml                                  |  4 ++--
 pom.xml                                            |  6 +++++
 19 files changed, 92 insertions(+), 39 deletions(-)


Reply via email to