(logging-log4j2) branch 2.x updated (86676c7487 -> d659fd2aea)

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a change to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 86676c7487 Fix site compilation
     add d659fd2aea Revert "Scoped context (#2438)"

No new revisions were added by this update.

Summary of changes:
 log4j-api-test/pom.xml                             |  11 +-
 .../org/apache/logging/log4j/test/TestLogger.java  |   9 +-
 .../log4j/test/spi/ScopedContextProviderSuite.java | 178 -------
 .../apache/logging/log4j/ScopedContextTest.java    | 243 ----------
 .../logging/log4j/ScopedResourceLoggerTest.java    | 141 ------
 .../org/apache/logging/log4j/ScopedContext.java    | 296 ------------
 .../apache/logging/log4j/ScopedResourceLogger.java | 109 -----
 .../log4j/internal/map/ScopedContextMap.java       | 338 --------------
 .../internal/map/UnmodifiableArrayBackedMap.java   |   4 +-
 .../apache/logging/log4j/message/package-info.java |   3 -
 .../org/apache/logging/log4j/package-info.java     |   2 +-
 .../apache/logging/log4j/simple/SimpleLogger.java  |   5 -
 .../logging/log4j/spi/AbstractResourceLogger.java  | 151 ------
 .../log4j/spi/AbstractScopedContextProvider.java   | 509 ---------------------
 .../org/apache/logging/log4j/spi/Provider.java     |   7 -
 .../logging/log4j/spi/ScopedContextProvider.java   |  82 ----
 .../spi/internal/DefaultScopedContextProvider.java | 109 -----
 .../logging/log4j/ScopedResourceLoggerTest.java    | 159 -------
 .../logging/log4j/core/ScopedContextTest.java      |  72 ---
 .../appender/routing/JsonRoutingAppender2Test.java |   2 +-
 .../core/impl/ThreadContextDataInjectorTest.java   |   2 +-
 log4j-core-test/src/test/resources/log4j-list2.xml |  31 --
 log4j-core-test/src/test/resources/log4j-map.xml   |  34 --
 .../src/test/resources/log4j-routing2.json         |   2 +-
 .../logging/log4j/core/ContextDataInjector.java    |  16 +-
 .../logging/log4j/core/async/AsyncLogger.java      |  10 +-
 .../log4j/core/async/RingBufferLogEvent.java       |   4 +-
 .../core/async/RingBufferLogEventTranslator.java   |  10 +-
 .../log4j/core/filter/DynamicThresholdFilter.java  |  19 +-
 .../log4j/core/filter/ThreadContextMapFilter.java  |  25 +-
 .../logging/log4j/core/filter/package-info.java    |   2 +-
 .../logging/log4j/core/impl/ContextData.java       | 110 -----
 .../core/impl/ContextDataInjectorFactory.java      |  25 +-
 .../log4j/core/impl/JdkMapAdapterStringMap.java    |   2 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java     |  20 -
 .../logging/log4j/core/impl/Log4jProvider.java     |   3 -
 .../log4j/core/impl/ReusableLogEventFactory.java   |  23 +-
 .../log4j/core/impl/ScopedContextDataProvider.java |  64 ---
 .../log4j/core/impl/ThreadContextDataInjector.java | 283 ++++++------
 .../log4j/core/impl/ThreadContextDataProvider.java |  15 -
 .../logging/log4j/core/impl/package-info.java      |   2 +-
 .../log4j/core/lookup/ContextMapLookup.java        |  18 +-
 .../apache/logging/log4j/core/osgi/Activator.java  |   4 +-
 .../log4j/core/util/ContextDataProvider.java       |  42 --
 .../logging/log4j/core/util/package-info.java      |   2 +-
 .../log4j/perf/appender/StringAppender.java        |  98 ----
 .../log4j/perf/jmh/ThreadContextBenchmark.java     |  11 +-
 .../jmh/ThreadContextVsScopedContextBenchmark.java | 430 -----------------
 src/changelog/.2.x.x/add_scoped_context.xml        |  10 -
 src/site/antora/modules/ROOT/nav.adoc              |   1 -
 .../modules/ROOT/pages/manual/resource-logger.adoc | 137 ------
 .../modules/ROOT/pages/manual/scoped-context.adoc  | 116 -----
 52 files changed, 212 insertions(+), 3789 deletions(-)
 delete mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/spi/ScopedContextProviderSuite.java
 delete mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/ScopedContextTest.java
 delete mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/ScopedResourceLoggerTest.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/ScopedContext.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/ScopedResourceLogger.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/internal/map/ScopedContextMap.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractResourceLogger.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractScopedContextProvider.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/ScopedContextProvider.java
 delete mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/internal/DefaultScopedContextProvider.java
 delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/ScopedResourceLoggerTest.java
 delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/ScopedContextTest.java
 delete mode 100644 log4j-core-test/src/test/resources/log4j-list2.xml
 delete mode 100644 log4j-core-test/src/test/resources/log4j-map.xml
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextData.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ScopedContextDataProvider.java
 delete mode 100644 log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/appender/StringAppender.java
 delete mode 100644 log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextVsScopedContextBenchmark.java
 delete mode 100644 src/changelog/.2.x.x/add_scoped_context.xml
 delete mode 100644 src/site/antora/modules/ROOT/pages/manual/resource-logger.adoc
 delete mode 100644 src/site/antora/modules/ROOT/pages/manual/scoped-context.adoc