This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/rebase-on-log4j-api-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
omit b8d502462f Fix Windows test failures
omit 030e2da078 Fix OSGi configuration
omit 8c2ac517b6 Adapt `log4j-perf-test` to Log4j API 2.x
omit 5e5e0b1ed2 Adapt `log4j-layout-template-json-test` to Log4j API 2.x
omit 8772d927b7 Adapt `log4j-jdbc` to Log4j API 2.x
omit c046f76f88 Adapt `log4j-gc-test` to Log4j API 2.x
omit 76419ecd45 Adapt `log4j-layout-template-json` to Log4j API 2.x
omit f5def618a5 Adapt `log4j-flume-ng` to Log4j API 2.x
omit b867e1321d Adapt `log4j-async-logger` to Log4j API 2.x
omit 00ac582ecf Adapt `log4j-core` to Log4j API 2.x
omit 11a0a43aa3 Adapt `log4j-plugins` to Log4j API 2.x
omit 5abda8ce08 Adapt `Log4jExtension` to Log4j API 2.x
omit 0ca03caebb Inline missing `String.trimToOptional`
omit cff6547762 Move `ReflectionUtil` to `log4j-plugins`
omit c2a0909b3c Replace `o.a.l.l.lang` annotations with JSpecify
omit 67b0fefa7a Rebase `log4j-to-slf4j` upon Log4j API 2.24.0
omit b764fa0075 Rebase `log4j-to-jul` upon Log4j API 2.24.0
omit 960c287da5 Downgrade to `log4j-api` version `2.24.0-SNAPSHOT`
omit bb350df692 Update @since tag
omit 076fa05e4a Move `Recycler` to `log4j-kit`
omit 17f1336e35 Fix Javadoc
omit c3f4261f98 Replace `PropertiesUtil` with `PropertyEnvironment`
add 1bbcf8b156 Replace `PropertiesUtil` with `PropertyEnvironment`
add 4ed5c1871f Fix Javadoc
add 39642b94a7 Add support for `Locale`, `TimeZone` and `ZoneId`
add d74dd97d56 Replace `JsonTemplateLayoutDefaults` with properties class
add d25aaf8bb3 Apply suggestions from review #2396
add d61ad26095 Rename `Resources` to `Log4jStaticResources`
add de4261030b Refactor property names
add 58033dbe8a Move `Recycler` to `log4j-kit`
add f154c16fa5 Update @since tag
add a3a734738e Downgrade to `log4j-api` version `2.24.0-SNAPSHOT`
add f8b57de9f9 Rebase `log4j-to-jul` upon Log4j API 2.24.0
add f52082b50d Rebase `log4j-to-slf4j` upon Log4j API 2.24.0
add d1d1d5e401 Replace `o.a.l.l.lang` annotations with JSpecify
add dccea80fc7 Move `ReflectionUtil` to `log4j-plugins`
add 7c711257d3 Inline missing `String.trimToOptional`
add 389783474d Adapt `Log4jExtension` to Log4j API 2.x
add f9cabd1e22 Adapt `log4j-plugins` to Log4j API 2.x
add a27abfcf5e Adapt `log4j-core` to Log4j API 2.x
add 95e3aa6abf Adapt `log4j-async-logger` to Log4j API 2.x
add ea18fd3b85 Adapt `log4j-flume-ng` to Log4j API 2.x
add c381c6d765 Adapt `log4j-layout-template-json` to Log4j API 2.x
add f87ef9ff1d Adapt `log4j-gc-test` to Log4j API 2.x
add fd4f0d0f57 Adapt `log4j-jdbc` to Log4j API 2.x
add af5b195d03 Adapt `log4j-layout-template-json-test` to Log4j API 2.x
add 0983aa89c3 Adapt `log4j-perf-test` to Log4j API 2.x
add c82b678c17 Fix OSGi configuration
add 937aaf0fa5 Fix Windows test failures
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 (b8d502462f)
\
N -- N -- N refs/heads/fix/rebase-on-log4j-api-2.x (937aaf0fa5)
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.
No new revisions were added by this update.
Summary of changes:
.../config/PropertiesConfigurationFactory.java | 3 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 3 +-
.../org/apache/log4j/config/AutoConfigTest.java | 3 +-
.../log4j/config/XmlConfigurationFactoryTest.java | 3 +-
.../log4j/test/junit/InitializesThreadContext.java | 2 +-
.../{Resources.java => Log4jStaticResources.java} | 4 +-
.../org/apache/logging/log4j/test/junit/Tags.java | 33 -----
.../log4j/test/junit/UsingThreadContextMap.java | 2 +-
.../apache/logging/log4j/AbstractLoggerTest.java | 4 +-
.../java/org/apache/logging/log4j/LoggerTest.java | 4 +-
.../java/org/apache/logging/log4j/MarkerTest.java | 4 +-
.../async/logger/AsyncLoggerConfigDelegate.java | 45 -------
.../async/logger/AsyncLoggerConfigDisruptor.java | 47 ++++---
...java => AsyncLoggerConfigExceptionHandler.java} | 8 +-
.../log4j/async/logger/AsyncLoggerContext.java | 4 +-
.../log4j/async/logger/AsyncLoggerDisruptor.java | 39 ++++--
...ndler.java => AsyncLoggerExceptionHandler.java} | 6 +-
.../log4j/async/logger/AsyncLoggerKeys.java | 75 ------------
.../log4j/async/logger/AsyncLoggerProperties.java | 51 ++++++++
.../AbstractAsyncExceptionHandler.java | 4 +-
.../AsyncLoggerConfigDefaultExceptionHandler.java | 8 +-
...ltBundle.java => AsyncLoggerDefaultBundle.java} | 50 ++++++--
.../AsyncLoggerDefaultExceptionHandler.java | 8 +-
...> AsyncLoggerInstanceFactoryPostProcessor.java} | 4 +-
.../internal/DefaultAsyncWaitStrategyFactory.java | 23 ++--
.../log4j/async/logger/internal/DisruptorUtil.java | 94 --------------
.../logger/AsyncLoggerConfigErrorOnFormat.java | 2 +-
.../AsyncLoggerEventTranslationExceptionTest.java | 3 +-
.../async/logger/QueueFullAsyncLogger3Test.java | 9 +-
.../logging/log4j/core/test/TestConstants.java | 56 +++++----
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 2 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 41 ++++---
.../log4j/core/config/TestConfiguratorError.java | 4 +-
.../core/config/xml/XmlConfigurationPropsTest.java | 4 +-
.../filter/MutableThreadContextMapFilterTest.java | 6 +-
.../logging/log4j/core/impl/TestPropertyKeys.java | 2 +-
.../log4j/core/net/UrlConnectionFactoryTest.java | 8 +-
.../core/net/ssl/SslConfigurationFactoryTest.java | 18 +--
.../apache/logging/log4j/core/LoggerContext.java | 8 +-
.../logging/log4j/core/appender/AsyncAppender.java | 4 +-
.../log4j/core/appender/ConsoleAppender.java | 5 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 68 +++++------
.../log4j/core/config/AbstractConfiguration.java | 6 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 4 +-
.../log4j/core/config/ConfigurationFactory.java | 6 +-
.../log4j/core/config/ConfigurationSource.java | 4 +-
.../core/config/DefaultConfigurationFactory.java | 12 +-
.../logging/log4j/core/config/HttpWatcher.java | 4 +-
.../core/config/ReliabilityStrategyFactory.java | 4 +-
.../core/filter/MutableThreadContextMapFilter.java | 4 +-
.../log4j/core/impl/ContextDataFactory.java | 4 +-
.../core/impl/ContextDataInjectorFactory.java | 2 +-
.../{DefaultBundle.java => CoreDefaultBundle.java} | 18 ++-
....java => CoreInstanceFactoryPostProcessor.java} | 33 +++--
.../impl/{CoreKeys.java => CoreProperties.java} | 135 ++++++++++-----------
.../log4j/core/impl/Log4jContextFactory.java | 7 +-
.../logging/log4j/core/impl/Log4jProvider.java | 3 +-
.../log4j/core/layout/AbstractStringLayout.java | 6 +-
.../logging/log4j/core/layout/PatternLayout.java | 4 +-
.../log4j/core/net/UrlConnectionFactory.java | 8 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 4 +-
.../core/net/ssl/SslConfigurationFactory.java | 6 +-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +-
.../logging/log4j/core/time/ClockFactory.java | 6 +-
.../log4j/core/time/internal/SystemClock.java | 7 +-
.../log4j/core/util/AuthorizationProvider.java | 17 +--
.../core/util/BasicAuthorizationProvider.java | 11 +-
.../apache/logging/log4j/core/util/Constants.java | 8 +-
.../org/apache/logging/log4j/core/util/Loader.java | 9 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 7 +-
.../log4j/gctests/GcFreeLoggingTestUtil.java | 4 +-
.../jctools/JCToolsRecyclerFactoryProvider.java | 11 +-
.../org/apache/logging/log4j/jndi/JndiManager.java | 9 +-
.../jndi/{JNDIKeys.java => JndiProperties.java} | 10 +-
.../logging/log4j/jndi/lookup/JndiLookup.java | 4 +-
.../log4j/jndi/selector/JndiContextSelector.java | 2 +-
log4j-jul/pom.xml | 2 +-
.../log4j/jul/{JulKeys.java => JulProperties.java} | 16 +--
.../apache/logging/log4j/jul/LevelConverter.java | 2 +-
.../apache/logging/log4j/jul/LevelTranslator.java | 2 +-
.../org/apache/logging/log4j/jul/LogManager.java | 2 +-
.../logging/log4j/jul/test/ApiLoggerTest.java | 2 +-
.../{JulTestKeys.java => JulTestProperties.java} | 6 +-
.../logging/log4j/kit/env/Log4jProperty.java | 10 ++
.../kit/env/support/BasicPropertyEnvironment.java | 44 ++++++-
.../logging/log4j/kit/recycler/Recycler.java | 5 -
.../{RecyclerKeys.java => RecyclerProperties.java} | 32 +++--
.../internal/QueueingRecyclerFactoryProvider.java | 8 +-
.../ThreadLocalRecyclerFactoryProvider.java | 11 +-
.../env/support/BasicPropertyEnvironmentTest.java | 51 +++++++-
.../internal/RecyclerFactoryRegistryTest.java | 4 +-
.../recycler/internal/RecyclerFactoryTestUtil.java | 4 +-
.../JsonTemplateLayoutAdditionalFieldTest.java | 4 +-
.../template/json/JsonTemplateLayoutTest.java | 5 +-
.../log4j/layout/template/json/TestHelpers.java | 3 +
.../resolver/StackTraceStringResolverTest.java | 6 +-
.../layout/template/json/JsonTemplateLayout.java | 85 +++++++++----
.../template/json/JsonTemplateLayoutDefaults.java | 113 -----------------
.../json/JsonTemplateLayoutProperties.java | 59 +++++++++
.../json/resolver/CaseConverterResolver.java | 4 +-
.../json/resolver/EventResolverContext.java | 6 +
.../template/json/resolver/ExceptionResolver.java | 9 +-
.../resolver/StackTraceElementResolverContext.java | 17 +++
.../json/resolver/TemplateResolverConfig.java | 13 +-
.../json/resolver/TemplateResolverContext.java | 3 +
.../template/json/resolver/TemplateResolvers.java | 2 +-
.../template/json/resolver/TimestampResolver.java | 12 +-
.../perf/jmh/AsyncLoggersLocationBenchmark.java | 2 +-
.../CopyOnWriteOpenHashMapThreadContextMap.java | 4 +-
.../GarbageFreeOpenHashMapThreadContextMap.java | 4 +-
.../logging/log4j/script/ScriptManagerImpl.java | 2 +-
.../{ScriptKeys.java => ScriptProperties.java} | 12 +-
.../script/factory/ScriptManagerFactoryImpl.java | 4 +-
.../apache/logging/log4j/script/TestConstants.java | 2 +-
114 files changed, 851 insertions(+), 875 deletions(-)
rename
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/{Resources.java
=> Log4jStaticResources.java} (96%)
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerConfigDelegate.java
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{AsyncLoggerConfigDefaultExceptionHandler.java
=> AsyncLoggerConfigExceptionHandler.java} (75%)
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{AsyncLoggerDefaultExceptionHandler.java
=> AsyncLoggerExceptionHandler.java} (78%)
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerKeys.java
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerProperties.java
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AbstractAsyncExceptionHandler.java (95%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AsyncLoggerConfigDefaultExceptionHandler.java (77%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/{DefaultBundle.java
=> AsyncLoggerDefaultBundle.java} (54%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AsyncLoggerDefaultExceptionHandler.java (77%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/{InstanceFactoryPostProcessor.java
=> AsyncLoggerInstanceFactoryPostProcessor.java} (89%)
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DisruptorUtil.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{DefaultBundle.java
=> CoreDefaultBundle.java} (92%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{Log4jInstanceFactoryPostProcessor.java
=> CoreInstanceFactoryPostProcessor.java} (71%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{CoreKeys.java =>
CoreProperties.java} (63%)
rename log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/{JNDIKeys.java
=> JndiProperties.java} (82%)
rename log4j-jul/src/main/java/org/apache/logging/log4j/jul/{JulKeys.java =>
JulProperties.java} (76%)
rename
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/{JulTestKeys.java =>
JulTestProperties.java} (86%)
rename
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/{RecyclerKeys.java
=> RecyclerProperties.java} (50%)
delete mode 100644
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
create mode 100644
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutProperties.java
rename
log4j-script/src/main/java/org/apache/logging/log4j/script/{ScriptKeys.java =>
ScriptProperties.java} (83%)
