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/18 08:28:37 UTC
(logging-log4j2) branch feature/2.x/logging-parent-11.3.0 updated (5a6b3240e9 -> 63cf4476af)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/2.x/logging-parent-11.3.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 5a6b3240e9 Restore Maven Surefire version
discard 5fb532c548 Run builds on test branch
discard 2e3b15b11b Upgrade from Groovy 3 to 4
discard 95833c3dba Bump `logging-parent` to 11.3.0
omit 63e65927d7 Enable `docker` profile in CI for `log4j-layout-template-json-test` (#2953)
omit 724281cec4 Implement `MessageFactory`-namespaced logger registry (#2936)
omit 1f148a4d66 Update `org.slf4j:slf4j-nop` to version `2.0.16` (#2955)
omit 3e70ef0f9f Update `net.java.dev.jna:jna` to version `5.15.0` (#2956)
omit 8c4e45dbf0 Switch MongoDB tests to use Docker
omit 77340db0ca Disable test on Fri 13th
omit 4789c47db1 Add missing `security.html` redirect
omit c7a59eb0b1 Fail build for `static transitive` modules
omit 8069c73c97 Refactor dependencies required by compression
omit 96f5fe7b8e Add changelog entry
omit fb32107aa8 init
omit 26ace099f3 Update `org.eclipse.platform:org.eclipse.osgi` to version `3.21.0` (#2940)
omit 5a907b9cf0 Consolidate Windows-specific constants in tests (#2767)
omit 45ce728710 Fix `download.adoc` links and stuff
omit 4ad6d7194d Minor version bump
omit 9659af1677 Update getting-started.adoc by removing repeated words
omit 07a87c58d4 Update moved links
omit a18bdce643 Replace `sha256` with `sha512` on download page
omit 1b9621439b Test custom 404 page
omit 2a99119515 Fix broken internal links
omit 6bf30903ae Add Matomo script to website
omit 92a8bb6166 Prepare for new development cycle
omit 27deaaf99f Merge tag 'rel/2.24.0' into 2.x
omit 51e34a3b05 Fix the reload of key and trust stores on reconfiguration (#2767)
omit 053620321d Update `org.mongodb:bson` to version `4.11.4` (#2926)
omit 043dfee7c3 Update `co.elastic.clients:elasticsearch-java` to version `8.15.1` (#2925)
omit 646c3d4fd5 Update review kit reference
omit ded8bf1ab1 Update `org.mongodb:bson` to version `5.1.4` (#2918)
omit 6903ee4a72 Fix review kit injection in `generate-email.sh`
omit ed6a29e482 Update `org.eclipse.jetty:jetty-bom` to version `9.4.56.v20240826` (#2917)
omit e947c036fa Downgrade Maven Surefire
omit 552eede1d8 Try downgrading Maven Surefire
omit 5d24b9b229 Try to enable test scanning
omit 600de16de4 Fix obsolete comments
omit f280a1860a Fix typo in `build.yaml`
omit 84ca9bd246 Disable FQDN test on misconfigured hosts
add b88bf2c4be Fix review kit injection in `generate-email.sh`
add 4686b2bc32 Update review kit reference
add 23f7846634 Add Matomo script to website
add eb41324c1d Fix broken internal links
add 3763822972 Replace `sha256` with `sha512` on download page
add af23c12841 Update moved links
add e9329cf680 Update getting-started.adoc by removing repeated words
add 2b616de104 Prepare for new development cycle
add 5a3f513aee Deploy `2.24.1` snapshots from `2.24.x` branch
add 2524c0e3a3 Fix bug in `DefaultThreadContextMap.putAll()`
add f3f45ec7ee Add changelog entry
add a87f311bf7 Refactor dependencies required by compression
add 5901dfbf54 Fail build for `static transitive` modules
add 10c5c224fa Disable test on Fri 13th
add 2062676c28 Implement `MessageFactory`-namespaced logger registry (#2961)
add 6fdab695c4 Improvements on the logger message factory namespacing (#2961)
add cf73143ebd Fix reloading of the configuration from HTTP(S)
new 9b7bd1cfd2 Bump `logging-parent` to 11.3.0
new 63cf4476af Upgrade from Groovy 3 to 4
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5a6b3240e9)
\
N -- N -- N refs/heads/feature/2.x/logging-parent-11.3.0 (63cf4476af)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yaml | 4 +-
.github/workflows/deploy-site.yaml | 2 +
.github/workflows/merge-dependabot.yaml | 1 +
.mvn/develocity.xml | 4 -
BUILDING.adoc | 7 -
.../apache/logging/log4j/message/package-info.java | 2 +-
.../logging/log4j/simple/SimpleLoggerContext.java | 10 +-
.../apache/logging/log4j/simple/package-info.java | 2 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 4 -
.../apache/logging/log4j/spi/LoggerContext.java | 7 +-
.../apache/logging/log4j/spi/LoggerRegistry.java | 93 +----
.../org/apache/logging/log4j/spi/package-info.java | 2 +-
log4j-appserver/pom.xml | 10 +
.../logging/log4j/core/test/ListErrorHandler.java} | 52 +--
.../logging/log4j/core/test/package-info.java | 4 +-
.../logging/log4j/core/LoggerContextTest.java | 40 ++
.../log4j/core/appender/FixedHostResolver.java | 47 ---
.../log4j/core/appender/HttpAppenderTest.java | 220 ++++++-----
.../log4j/core/appender/LineReadingTcpServer.java | 227 -----------
.../SecureSocketAppenderSocketOptionsTest.java | 140 +++++++
.../core/appender/SocketAppenderReconnectTest.java | 397 -------------------
.../SocketAppenderSslSocketOptionsTest.java | 203 ----------
.../logging/log4j/core/appender/SslContexts.java | 64 ---
.../log4j/core/appender/TlsSyslogAppenderTest.java | 12 +-
.../log4j/core/async/AsyncLoggerContextTest.java | 27 +-
.../log4j/core/config/ConfigurationSourceTest.java | 62 +--
.../filter/HttpThreadContextMapFilterTest.java | 202 ----------
.../filter/MutableThreadContextMapFilterTest.java | 250 +++++++++---
.../core/net/SocketAppenderReconnectTest.java | 437 +++++++++++++++++++++
.../log4j/core/net/UrlConnectionFactoryTest.java | 213 +++++-----
.../logging/log4j/core/net/WireMockUtil.java | 84 ++++
.../core/net/ssl/KeyStoreConfigurationTest.java | 76 ++--
.../core/net/ssl/SslConfigurationFactoryTest.java | 55 +--
.../log4j/core/net/ssl/SslConfigurationTest.java | 45 +--
.../log4j/core/net/ssl/SslKeyStoreConstants.java | 90 -----
.../logging/log4j/core/net/ssl/TestConstants.java | 71 ++++
.../core/net/ssl/TrustStoreConfigurationTest.java | 28 +-
.../logging/log4j/core/util/HttpWatcherTest.java | 160 ++++++++
.../logging/log4j/core/util/WatchHttpTest.java | 156 --------
.../logging/log4j/core/util/WatchManagerTest.java | 177 +++++----
...g4j2-mutableFilter.xml => HttpAppenderTest.xml} | 16 +-
.../resources/config/ConfigurationSourceTest.xml | 13 +-
.../src/test/resources/emptyConfig.json | 4 -
.../filter/MutableThreadContextMapFilterTest.xml | 15 +-
.../src/test/resources/filterConfig.json | 6 -
.../test/resources/log4j-ssl-socket-options.xml | 40 ++
.../apache/logging/log4j/core/net/ssl/.gitignore | 1 -
.../org/apache/logging/log4j/core/net/ssl/README | 13 +
.../logging/log4j/core/net/ssl/build/gencerts.sh | 28 ++
.../logging/log4j/core/net/ssl/build/rootca.conf | 9 +
.../logging/log4j/core/net/ssl/build/server.conf | 9 +
.../core/net/ssl/client.log4j2-keystore-nopass.p12 | Bin 0 -> 3813 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 0 -> 3520 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.p12 | Bin 0 -> 4023 bytes
.../logging/log4j/core/net/ssl/generate-stores.sh | 129 ------
.../logging/log4j/core/net/ssl/keyStore-nopass.p12 | Bin 3907 -> 0 bytes
.../apache/logging/log4j/core/net/ssl/keyStore.jks | Bin 3473 -> 0 bytes
.../apache/logging/log4j/core/net/ssl/keyStore.p12 | Bin 4132 -> 0 bytes
.../logging/log4j/core/net/ssl/keyStore2.jks | Bin 3474 -> 0 bytes
.../log4j/core/net/ssl/server.log4j2-crt.pem | 17 +
.../logging/log4j/core/net/ssl/server.log4j2.pem | 23 ++
.../logging/log4j/core/net/ssl/trustStore.jks | Bin 754 -> 0 bytes
.../logging/log4j/core/net/ssl/trustStore2.jks | Bin 754 -> 0 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 0 -> 776 bytes
.../apache/logging/log4j/core/LoggerContext.java | 49 +--
.../log4j/core/appender/AbstractAppender.java | 6 +-
.../core/appender/HttpURLConnectionManager.java | 3 +-
.../logging/log4j/core/async/package-info.java | 2 +-
.../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 ++-
.../apache/logging/log4j/core/net/SmtpManager.java | 3 +-
.../logging/log4j/core/net/SslSocketManager.java | 62 +--
.../log4j/core/net/UrlConnectionFactory.java | 3 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 9 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 6 +-
.../log4j/core/net/ssl/PasswordProvider.java | 1 -
.../log4j/core/net/ssl/SslConfiguration.java | 240 ++++++-----
.../core/net/ssl/SslConfigurationFactory.java | 3 +-
.../log4j/core/net/ssl/StoreConfiguration.java | 2 +-
.../core/net/ssl/TrustStoreConfiguration.java | 6 +-
.../logging/log4j/core/net/ssl/package-info.java | 2 +-
.../apache/logging/log4j/core/package-info.java | 2 +-
.../logging/log4j/core/util/WatchManager.java | 23 +-
.../core/util/internal/HttpInputStreamUtil.java | 96 +++--
.../org/apache/logging/log4j/smtp/SmtpManager.java | 3 +-
log4j-layout-template-json-test/pom.xml | 140 +++----
.../log4j/layout/template/json/LogstashIT.java | 152 +++----
log4j-mongodb/pom.xml | 157 ++------
...appedIT.java => AbstractMongoDbCappedTest.java} | 11 +-
...ldsIT.java => MongoDbAdditionalFieldsTest.java} | 14 +-
...hFailureIT.java => MongoDbAuthFailureTest.java} | 15 +-
...bCappedIntIT.java => MongoDbCappedIntTest.java} | 16 +-
...appedLongIT.java => MongoDbCappedLongTest.java} | 16 +-
...apMessageIT.java => MongoDbMapMessageTest.java} | 14 +-
.../logging/log4j/mongodb/MongoDbResolver.java | 135 ++++++-
...oDbResolverIT.java => MongoDbResolverTest.java} | 7 +-
.../mongodb/{MongoDbIT.java => MongoDbTest.java} | 14 +-
.../log4j/mongodb/MongoDbTestConstants.java | 3 +-
.../src/test/resources/MongoDbAdditionalFields.xml | 37 --
.../resources/log4j2-mongodb-additional-fields.xml | 16 +-
...ilureIT.xml => log4j2-mongodb-auth-failure.xml} | 12 +-
...ppedIntIT.xml => log4j2-mongodb-capped-int.xml} | 12 +-
...edLongIT.xml => log4j2-mongodb-capped-long.xml} | 12 +-
...essageIT.xml => log4j2-mongodb-map-message.xml} | 12 +-
.../{MongoDbIT.xml => log4j2-mongodb.xml} | 12 +-
log4j-mongodb4/pom.xml | 146 ++-----
...ppedIT.java => AbstractMongoDb4CappedTest.java} | 11 +-
...dsIT.java => MongoDb4AdditionalFieldsTest.java} | 14 +-
...FailureIT.java => MongoDb4AuthFailureTest.java} | 15 +-
...CappedIntIT.java => MongoDb4CappedIntTest.java} | 16 +-
...ppedLongIT.java => MongoDb4CappedLongTest.java} | 16 +-
...pMessageIT.java => MongoDb4MapMessageTest.java} | 14 +-
.../logging/log4j/mongodb4/MongoDb4Resolver.java | 137 ++++++-
...b4ResolverIT.java => MongoDb4ResolverTest.java} | 7 +-
.../{MongoDb4IT.java => MongoDb4Test.java} | 14 +-
.../log4j/mongodb4/MongoDb4TestConstants.java | 3 +-
.../test/resources/MongoDb4AdditionalFields.xml | 37 --
.../resources/log4j2-mongodb-additional-fields.xml | 16 +-
...ilureIT.xml => log4j2-mongodb-auth-failure.xml} | 12 +-
...ppedIntIT.xml => log4j2-mongodb-capped-int.xml} | 12 +-
...edLongIT.xml => log4j2-mongodb-capped-long.xml} | 12 +-
...essageIT.xml => log4j2-mongodb-map-message.xml} | 12 +-
.../src/test/resources/log4j2-mongodb.xml | 12 +-
log4j-parent/pom.xml | 49 ++-
log4j-taglib/pom.xml | 14 +-
.../log4j/taglib/Log4jTaglibLoggerContext.java | 21 +-
.../apache/logging/log4j/taglib/package-info.java | 2 +-
.../logging/log4j/tojul/JULLoggerContext.java | 17 +-
.../apache/logging/log4j/tojul/package-info.java | 2 +-
.../apache/logging/slf4j/SLF4JLoggerContext.java | 17 +-
.../org/apache/logging/slf4j/package-info.java | 2 +-
pom.xml | 20 +-
src/changelog/.2.x.x/2767_reload_key_stores.xml | 9 -
.../.2.x.x/2767_simplify_SSL_config_logic.xml | 9 -
...eprecate_AbstractLogger_checkMessageFactory.xml | 8 -
...29_mongodb_docker.xml => 2937-http-watcher.xml} | 4 +-
...pdate_co_elastic_clients_elasticsearch_java.xml | 8 -
.../.2.x.x/update_net_java_dev_jna_jna.xml | 8 -
...pdate_org_eclipse_platform_org_eclipse_osgi.xml | 8 -
.../.2.x.x/update_org_slf4j_slf4j_nop.xml | 8 -
.../2.24.0/update_org_eclipse_jetty_jetty_bom.xml | 4 +-
src/changelog/2.24.0/update_org_mongodb_bson.xml | 4 +-
src/site/antora/modules/ROOT/pages/download.adoc | 39 +-
src/site/resources/.htaccess | 6 -
147 files changed, 2802 insertions(+), 3487 deletions(-)
rename log4j-core-test/src/{test/java/org/apache/logging/log4j/core/appender/BufferingErrorHandler.java => main/java/org/apache/logging/log4j/core/test/ListErrorHandler.java} (50%)
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FixedHostResolver.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/LineReadingTcpServer.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSslSocketOptionsTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SslContexts.java
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/SocketAppenderReconnectTest.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/WireMockUtil.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslKeyStoreConstants.java
create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/TestConstants.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
rename log4j-core-test/src/test/resources/{log4j2-mutableFilter.xml => HttpAppenderTest.xml} (69%)
copy log4j-mongodb/src/test/resources/MongoDbIT.xml => log4j-core-test/src/test/resources/config/ConfigurationSourceTest.xml (77%)
delete mode 100644 log4j-core-test/src/test/resources/emptyConfig.json
copy log4j-mongodb/src/test/resources/MongoDbCappedIntIT.xml => log4j-core-test/src/test/resources/filter/MutableThreadContextMapFilterTest.xml (79%)
delete mode 100644 log4j-core-test/src/test/resources/filterConfig.json
create mode 100644 log4j-core-test/src/test/resources/log4j-ssl-socket-options.xml
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/.gitignore
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/README
create mode 100755 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/gencerts.sh
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/rootca.conf
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/server.conf
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore-nopass.p12
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore.jks
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore.p12
delete mode 100755 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/generate-stores.sh
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore-nopass.p12
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore.jks
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore.p12
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore2.jks
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2-crt.pem
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2.pem
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/trustStore.jks
delete mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/trustStore2.jks
create mode 100644 log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/truststore.jks
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{AbstractMongoDbCappedIT.java => AbstractMongoDbCappedTest.java} (84%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbAdditionalFieldsIT.java => MongoDbAdditionalFieldsTest.java} (88%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbAuthFailureIT.java => MongoDbAuthFailureTest.java} (77%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbCappedIntIT.java => MongoDbCappedIntTest.java} (64%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbCappedLongIT.java => MongoDbCappedLongTest.java} (64%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbMapMessageIT.java => MongoDbMapMessageTest.java} (81%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbResolverIT.java => MongoDbResolverTest.java} (86%)
rename log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/{MongoDbIT.java => MongoDbTest.java} (84%)
delete mode 100644 log4j-mongodb/src/test/resources/MongoDbAdditionalFields.xml
rename log4j-mongodb4/src/test/resources/MongoDb4IT.xml => log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml (68%)
rename log4j-mongodb/src/test/resources/{MongoDbAuthFailureIT.xml => log4j2-mongodb-auth-failure.xml} (67%)
rename log4j-mongodb/src/test/resources/{MongoDbCappedIntIT.xml => log4j2-mongodb-capped-int.xml} (70%)
rename log4j-mongodb/src/test/resources/{MongoDbCappedLongIT.xml => log4j2-mongodb-capped-long.xml} (71%)
rename log4j-mongodb/src/test/resources/{MongoDbMapMessageIT.xml => log4j2-mongodb-map-message.xml} (68%)
copy log4j-mongodb/src/test/resources/{MongoDbIT.xml => log4j2-mongodb.xml} (68%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{AbstractMongoDb4CappedIT.java => AbstractMongoDb4CappedTest.java} (84%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4AdditionalFieldsIT.java => MongoDb4AdditionalFieldsTest.java} (88%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4AuthFailureIT.java => MongoDb4AuthFailureTest.java} (76%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4CappedIntIT.java => MongoDb4CappedIntTest.java} (64%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4CappedLongIT.java => MongoDb4CappedLongTest.java} (64%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4MapMessageIT.java => MongoDb4MapMessageTest.java} (80%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4ResolverIT.java => MongoDb4ResolverTest.java} (86%)
rename log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/{MongoDb4IT.java => MongoDb4Test.java} (84%)
delete mode 100644 log4j-mongodb4/src/test/resources/MongoDb4AdditionalFields.xml
copy log4j-mongodb/src/test/resources/MongoDbIT.xml => log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml (68%)
rename log4j-mongodb4/src/test/resources/{MongoDb4AuthFailureIT.xml => log4j2-mongodb-auth-failure.xml} (67%)
rename log4j-mongodb4/src/test/resources/{MongoDb4CappedIntIT.xml => log4j2-mongodb-capped-int.xml} (70%)
rename log4j-mongodb4/src/test/resources/{MongoDb4CappedLongIT.xml => log4j2-mongodb-capped-long.xml} (71%)
rename log4j-mongodb4/src/test/resources/{MongoDb4MapMessageIT.xml => log4j2-mongodb-map-message.xml} (68%)
rename log4j-mongodb/src/test/resources/MongoDbIT.xml => log4j-mongodb4/src/test/resources/log4j2-mongodb.xml (68%)
delete mode 100644 src/changelog/.2.x.x/2767_reload_key_stores.xml
delete mode 100644 src/changelog/.2.x.x/2767_simplify_SSL_config_logic.xml
delete mode 100644 src/changelog/.2.x.x/2936_deprecate_AbstractLogger_checkMessageFactory.xml
rename src/changelog/.2.x.x/{2229_mongodb_docker.xml => 2937-http-watcher.xml} (61%)
delete mode 100644 src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml
delete mode 100644 src/changelog/.2.x.x/update_net_java_dev_jna_jna.xml
delete mode 100644 src/changelog/.2.x.x/update_org_eclipse_platform_org_eclipse_osgi.xml
delete mode 100644 src/changelog/.2.x.x/update_org_slf4j_slf4j_nop.xml
(logging-log4j2) 02/02: Upgrade from Groovy 3 to 4
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/2.x/logging-parent-11.3.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 63cf4476af76399a2d709cdfa27f059dedb552f6
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Sep 17 17:06:59 2024 +0200
Upgrade from Groovy 3 to 4
---
log4j-core-test/pom.xml | 4 ++--
log4j-parent/pom.xml | 20 ++------------------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index e23fc2c476..f770ea8870 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -174,12 +174,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-dateutil</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
<scope>test</scope>
</dependency>
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index bd2874e9e1..e87e3e7309 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -53,7 +53,6 @@
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
<docker-maven-plugin.version>0.45.0</docker-maven-plugin.version>
<exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
- <gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
<maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
<!-- `surefire.version` property used in `apache.org:apache`: -->
<surefire.version>3.5.0</surefire.version>
@@ -84,7 +83,7 @@
<felix.version>7.0.5</felix.version>
<flapdoodle-embed.version>4.13.1</flapdoodle-embed.version>
<flapdoodle-reverse.version>1.8.0</flapdoodle-reverse.version>
- <groovy.version>3.0.22</groovy.version>
+ <groovy.version>4.0.22</groovy.version>
<guava.version>33.3.0-jre</guava.version>
<h2.version>2.2.224</h2.version>
<hamcrest.version>3.0</hamcrest.version>
@@ -176,7 +175,7 @@
<!-- END: Modules that are not published (and hence missing in the BOM) -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-bom</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
@@ -983,21 +982,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>ban-static-transitive</id>
(logging-log4j2) 01/02: Bump `logging-parent` to 11.3.0
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/2.x/logging-parent-11.3.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9b7bd1cfd262268b1ce76a6f4a612c5f2f72dd78
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Sep 17 17:01:35 2024 +0200
Bump `logging-parent` to 11.3.0
---
pom.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ca216b5a2e..6697e584cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>11.2.0</version>
+ <version>11.3.0</version>
<relativePath />
</parent>
@@ -541,6 +541,16 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>apache.staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachelogging-1296</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>