You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/09/22 08:32:56 UTC
(logging-log4j2) branch 2.24.x updated (80b6a5921e -> 149dbe70e8)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch 2.24.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 80b6a5921e Pin `gradle/develocity-actions`
add be24f928f8 Fix reloading of the configuration from HTTP(S)
add 93483ef03e Bump `logging-parent` to 11.3.0
add bf97552b44 Upgrade from Groovy 3 to 4
add c96ead3934 Switch MongoDB tests to use Docker
add 428d1126d7 Enable `docker` profile in CI for `log4j-layout-template-json-test` (#2953)
add ea1fc0814b Add changelog for `logging-parent`
add f798774fc0 Upgrade actions to `logging-parent/11.3.0`
add 92df5b51af Update staging repo address
add 149dbe70e8 Cleanup after `11.3.0` official release
No new revisions were added by this update.
Summary of changes:
.github/workflows/build.yaml | 6 +-
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/deploy-site.yaml | 6 +-
.github/workflows/merge-dependabot.yaml | 4 +-
BUILDING.adoc | 7 +
log4j-appserver/pom.xml | 10 +
log4j-core-test/pom.xml | 4 +-
.../log4j/core/config/ConfigurationSourceTest.java | 62 ++---
.../filter/HttpThreadContextMapFilterTest.java | 202 -----------------
.../filter/MutableThreadContextMapFilterTest.java | 250 ++++++++++++++++-----
.../log4j/core/net/UrlConnectionFactoryTest.java | 213 ++++++++----------
.../logging/log4j/core/net/WireMockUtil.java | 84 +++++++
.../logging/log4j/core/util/HttpWatcherTest.java | 160 +++++++++++++
.../logging/log4j/core/util/WatchHttpTest.java | 156 -------------
.../logging/log4j/core/util/WatchManagerTest.java | 177 ++++++++-------
.../resources/config/ConfigurationSourceTest.xml | 16 +-
.../src/test/resources/emptyConfig.json | 4 -
.../MutableThreadContextMapFilterTest.xml} | 24 +-
.../src/test/resources/filterConfig.json | 6 -
.../apache/logging/log4j/core/LoggerContext.java | 19 +-
.../log4j/core/config/AbstractConfiguration.java | 17 +-
.../log4j/core/config/ConfigurationSource.java | 68 +++---
.../logging/log4j/core/config/HttpWatcher.java | 39 +++-
.../log4j/core/config/xml/XmlConfiguration.java | 12 +-
.../core/filter/MutableThreadContextMapFilter.java | 50 +++--
.../logging/log4j/core/util/WatchManager.java | 23 +-
.../core/util/internal/HttpInputStreamUtil.java | 96 ++++++--
log4j-layout-template-json-test/pom.xml | 140 +++++++-----
.../log4j/layout/template/json/LogstashIT.java | 152 +++++++++----
log4j-mongodb/pom.xml | 157 ++++++++++---
...appedTest.java => AbstractMongoDbCappedIT.java} | 11 +-
...ldsTest.java => MongoDbAdditionalFieldsIT.java} | 14 +-
...hFailureTest.java => MongoDbAuthFailureIT.java} | 15 +-
...CappedLongTest.java => MongoDbCappedIntIT.java} | 16 +-
...CappedIntTest.java => MongoDbCappedLongIT.java} | 16 +-
.../mongodb/{MongoDbTest.java => MongoDbIT.java} | 14 +-
...apMessageTest.java => MongoDbMapMessageIT.java} | 14 +-
.../logging/log4j/mongodb/MongoDbResolver.java | 135 +----------
...oDbResolverTest.java => MongoDbResolverIT.java} | 7 +-
.../log4j/mongodb/MongoDbTestConstants.java | 3 +-
...-capped-int.xml => MongoDbAdditionalFields.xml} | 19 +-
...odb-capped-int.xml => MongoDbAuthFailureIT.xml} | 14 +-
...ngodb-capped-int.xml => MongoDbCappedIntIT.xml} | 12 +-
...odb-capped-long.xml => MongoDbCappedLongIT.xml} | 12 +-
...mongodb-additional-fields.xml => MongoDbIT.xml} | 16 +-
.../src/test/resources/MongoDbMapMessageIT.xml | 12 +-
.../src/test/resources/log4j2-mongodb.xml | 29 ---
log4j-mongodb4/pom.xml | 146 ++++++++++--
...ppedTest.java => AbstractMongoDb4CappedIT.java} | 11 +-
...dsTest.java => MongoDb4AdditionalFieldsIT.java} | 14 +-
...FailureTest.java => MongoDb4AuthFailureIT.java} | 15 +-
...CappedIntTest.java => MongoDb4CappedIntIT.java} | 16 +-
...ppedLongTest.java => MongoDb4CappedLongIT.java} | 16 +-
.../{MongoDb4Test.java => MongoDb4IT.java} | 14 +-
...pMessageTest.java => MongoDb4MapMessageIT.java} | 14 +-
.../logging/log4j/mongodb4/MongoDb4Resolver.java | 137 +----------
...b4ResolverTest.java => MongoDb4ResolverIT.java} | 7 +-
.../log4j/mongodb4/MongoDb4TestConstants.java | 3 +-
.../test/resources/MongoDb4AdditionalFields.xml | 19 +-
...-auth-failure.xml => MongoDb4AuthFailureIT.xml} | 12 +-
...godb-capped-int.xml => MongoDb4CappedIntIT.xml} | 12 +-
...db-capped-long.xml => MongoDb4CappedLongIT.xml} | 12 +-
.../src/test/resources/MongoDb4IT.xml | 13 +-
.../src/test/resources/MongoDb4MapMessageIT.xml | 12 +-
.../resources/log4j2-mongodb-additional-fields.xml | 33 ---
.../src/test/resources/log4j2-mongodb.xml | 29 ---
log4j-parent/pom.xml | 65 +-----
pom.xml | 2 +-
src/changelog/.2.x.x/2229_mongodb_docker.xml | 8 +
src/changelog/.2.x.x/2937-http-watcher.xml | 8 +
.../update_org_apache_logging_logging_parent.xml | 7 +
71 files changed, 1642 insertions(+), 1508 deletions(-)
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/HttpThreadContextMapFilterTest.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/WireMockUtil.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/HttpWatcherTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
copy log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml => log4j-core-test/src/test/resources/config/ConfigurationSourceTest.xml (70%)
delete mode 100644 log4j-core-test/src/test/resources/emptyConfig.json
rename log4j-core-test/src/test/resources/{log4j2-mutableFilter.xml => filter/MutableThreadContextMapFilterTest.xml} (61%)
delete mode 100644 log4j-core-test/src/test/resources/filterConfig.json
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{AbstractMongoDbCappedTest.java => AbstractMongoDbCappedIT.java} (84%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbAdditionalFieldsTest.java => MongoDbAdditionalFieldsIT.java} (88%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbAuthFailureTest.java => MongoDbAuthFailureIT.java} (77%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbCappedLongTest.java => MongoDbCappedIntIT.java} (64%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbCappedIntTest.java => MongoDbCappedLongIT.java} (64%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbTest.java => MongoDbIT.java} (84%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbMapMessageTest.java => MongoDbMapMessageIT.java} (81%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbResolverTest.java => MongoDbResolverIT.java} (86%)
copy log4j-mongodb/src/test/resources/{log4j2-mongodb-capped-int.xml => MongoDbAdditionalFields.xml} (60%)
copy log4j-mongodb/src/test/resources/{log4j2-mongodb-capped-int.xml => MongoDbAuthFailureIT.xml} (67%)
copy log4j-mongodb/src/test/resources/{log4j2-mongodb-capped-int.xml => MongoDbCappedIntIT.xml} (70%)
rename log4j-mongodb/src/test/resources/{log4j2-mongodb-capped-long.xml => MongoDbCappedLongIT.xml} (71%)
rename log4j-mongodb/src/test/resources/{log4j2-mongodb-additional-fields.xml => MongoDbIT.xml} (68%)
rename log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml => log4j-mongodb/src/test/resources/MongoDbMapMessageIT.xml (68%)
delete mode 100644 log4j-mongodb/src/test/resources/log4j2-mongodb.xml
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{AbstractMongoDb4CappedTest.java => AbstractMongoDb4CappedIT.java} (84%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4AdditionalFieldsTest.java => MongoDb4AdditionalFieldsIT.java} (88%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4AuthFailureTest.java => MongoDb4AuthFailureIT.java} (76%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4CappedIntTest.java => MongoDb4CappedIntIT.java} (64%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4CappedLongTest.java => MongoDb4CappedLongIT.java} (64%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4Test.java => MongoDb4IT.java} (84%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4MapMessageTest.java => MongoDb4MapMessageIT.java} (80%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4ResolverTest.java => MongoDb4ResolverIT.java} (86%)
rename log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml => log4j-mongodb4/src/test/resources/MongoDb4AdditionalFields.xml (60%)
rename log4j-mongodb4/src/test/resources/{log4j2-mongodb-auth-failure.xml => MongoDb4AuthFailureIT.xml} (67%)
rename log4j-mongodb4/src/test/resources/{log4j2-mongodb-capped-int.xml => MongoDb4CappedIntIT.xml} (70%)
rename log4j-mongodb4/src/test/resources/{log4j2-mongodb-capped-long.xml => MongoDb4CappedLongIT.xml} (71%)
rename log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml => log4j-mongodb4/src/test/resources/MongoDb4IT.xml (68%)
rename log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml => log4j-mongodb4/src/test/resources/MongoDb4MapMessageIT.xml (68%)
delete mode 100644 log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
delete mode 100644 log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
create mode 100644 src/changelog/.2.x.x/2229_mongodb_docker.xml
create mode 100644 src/changelog/.2.x.x/2937-http-watcher.xml
create mode 100644 src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml