You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2022/01/10 14:04:51 UTC

[logging-log4j2] branch dependabot/maven/spring-boot.version-2.6.2 updated (085e391 -> 38d417d)

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

github-bot pushed a change to branch dependabot/maven/spring-boot.version-2.6.2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.


 discard 085e391  Bump spring-boot.version from 2.5.7 to 2.6.2
     add 78eddfa  No need to nest.
     add d6967f4  Add missing Javadoc.
     add 05db5f9  Refactor to reuse existing code.
     add e1b2322  LOG4J2-3292: Fix ExtendedLoggerWrapper.logMessage double-logging
     add 14f0bd0  Revert "LOG4J2-3288 Interpolator non-plugin ctor includes all core lookups"
     add 589b1ab  Initial interpolator constructor does not register the `ctx` lookup
     add f60e4ed  LOG4J2-3290. Remove unused method
     add 1724b77  [DOC] fix typos and other minor improvements
     add 6673628  [DOC] update security page to add other OS-es where RCE has been demonstrated for CVE-2021-44228
     add 6b3557d  Prepare for 2.17.1 release
     add 11dafda  [maven-release-plugin] prepare release log4j-2.17.1-rc1
     add 1443025  [maven-release-plugin] prepare for next development iteration
     add e5c8339  Fix rat:check failures.
     add 6f963cd  Make KafkaAppender#isRecursive() garbage-free.
     add ae9ba78  Revert garbage-free KafkaAppender#isRecursive(), since KafkaAppender itself is far from being garbage-free.
     add fbe39dd  Only disable CassandraAppenderIT on aarch64, not all the time.
     add a7d20e7  Parameterize Cassandra version in order to debug test failures.
     add 7a76441  Add info for 2.17.1
     add a298555  Fix RELEASE-NOTES.md.
     add 9d43365  Fixed Jenkins badge.
     add 2d8d791  Fixed hyperlinks
     add 6479149  moved the API separation to the manual directory
     add d5b9422  Git ignore macOS noise.
     add 3c1290f  Log4j 1.2 bridge class ConsoleAppender should extend WriterAppender and provide better compatibility with custom appenders.
     add 9f3f132  Fix formatting in XML.
     add 10770ab  [DOC] update left side nav menu to point to 2.3.2 and 2.14.2
     add ba77819  [DOC] update POM ReleaseVersionJava6/7 to 2.3.2 and 2.12.4
     add a71a5b7  Log4j 2.17.1
     add 92b33f9  [DOC] update migration page; add link to EOL info
     add dc5b6de  [DOC] update email and other links on security page:
     add d6bb11e  [DOC] minor changes
     add 88cd33e  [DOC] fix typo in Configuration left side menu item
     add e5ab46b  Execute "apache-rat:check" goal in Maven "verify" stage.
     add 8c1ea14  Add script for verifying release signatures and hashes.
     add a8134db  Log4j 1.2 bridge method NDC.inherit(Stack) should not use generics to provide source compatibility.
     add 7f4a9b6  Log4j 1.2 bridge method NDC.inherit(Stack) should not use generics to provide source compatibility.
     add 62b1074  Log4j 1.2 bridge class ConsoleAppender should extend WriterAppender and provide better compatibility with custom appenders.
     add 8c71bcd  Log4j 1.2 bridge class PatternLayout is missing constants DEFAULT_CONVERSION_PATTERN and TTCC_CONVERSION_PATTERN.
     add b82a183  Log4j 1.2 bridge class PatternLayout is missing constants DEFAULT_CONVERSION_PATTERN and TTCC_CONVERSION_PATTERN.
     add 2fd374d  Sort members.
     add 3c828b5  Add Javadoc.
     add 3cd08e2  Format Javadoc.
     add 1896e22  Log4j 1.2 bridge class PropertyConfigurator should implement Configurator.
     add 4d3a151  Log4j 1.2 bridge class PropertyConfigurator should implement Configurator.
     add d09425d  Log4j 1.2 bridge class OptionConverter is missing selectAndConfigure() methods.
     add 052d945  Log4j 1.2 bridge class OptionConverter is missing selectAndConfigure() methods.
     add 0fb3eb7  Log4j 1.2 bridge class Category should implement AppenderAttachable.
     add 006e616  Log4j 1.2 bridge class Category should implement AppenderAttachable.
     add 451ef58  Log4j 1.2 bridge method Category.exists(String) should be static.
     add adc6dd5  Log4j 1.2 bridge method Category.exists(String) should be static.
     add 4a5fd2c  Log4j 1.2 bridge method org.apache.log4j.Category.getDefaultHierarchy() is missing.
     add d46dd94  Log4j 1.2 bridge method org.apache.log4j.Category.getDefaultHierarchy() is missing.
     add 722fa79  Fix Javadoc.
     add 24e74b4  Add whitespace between methods.
     add bdb1136  Match Javadoc to enum value.
     add a281fdd  Log4j 1.2 bridge LogManager class default constructor should be public.
     add 6d922f7  Log4j 1.2 bridge LogManager class default constructor should be public.
     add bce7438  Log4j 1.2 bridge interface org.apache.log4j.spi.RendererSupport was in the wrong package and incomplete.
     add 44f2a03  Log4j 1.2 bridge interface org.apache.log4j.spi.RendererSupport was in the wrong package and incomplete.
     add 75391df  [LOG4J2-3267] make Generate#generate method public for automation
     add f1a729e  [LOG4J2-3267] update changes.xml
     add a1328b9  [LOG4J2-3281] PropertiesConfiguration.buildAppender not adding filters to custom appender.
     add 188a2cc  [LOG4J2-3281] PropertiesConfiguration.buildAppender not adding filters to custom appender.
     add 533ad83  Revert "[LOG4J2-3281] PropertiesConfiguration.buildAppender not adding filters"
     add ddaea03  Revert "[LOG4J2-3267] make Generate#generate method public for automation"
     add 4e3ae47  [LOG4J2-3267] add public Generate#generateExtend/Custom methods for automation
     add 1c30a92  [BUILD] add .toDelete file to RAT exclusions
     add 3a1c57c  Port from master.
     add 2512cf2  Constants are upper case.
     add 462cd74  Add related projects.
     add 2f402cc  Update my developer entry.
     add 8a90c5a  Refactor out a new SystemPropertyTestRule out of AvailablePortSystemPropertyTestRule for use from log4j-tools.
     add 6a21ada  Log4 j2 3306 (#677)
     add 491a0b3  Correct Jira issue number
     add 79d6427  [LOG4J2-3281] PropertiesConfiguration.buildAppender not adding filters to custom appender.
     add 2d862fe  Fix license header location.
     add a2d5200  [LOG4J2-3316] Log4j 1.2 bridge should ignore case in properties file keys.
     add d37b24f  Move entry.
     add 6fcd729  Better description.
     add aa31259  [LOG4J2-3316] Log4j 1.2 bridge should ignore case in properties file keys.
     add 9c2e672  [LOG4J2-3316] Log4j 1.2 bridge should ignore case in properties file keys.
     add 15d3cbb  Fix test on Windows.
     add 001ac91  Log4j 1.2 bridge adds org.apache.log4j.component.helpers.Constants.
     add c47e984  Log4j 1.2 bridge adds org.apache.log4j.component.helpers.Constants.
     add 8b6dd63  Log4j 1.2 bridge adds org.apache.log4j.helpers.LogLog.
     add cb4d703  Log4j 1.2 bridge adds org.apache.log4j.helpers.LogLog.
     add ffa606e  Fix indentation.
     add 2827b5b  Log4j 1.2 bridge adds org.apache.log4j.helpers.Loader.
     add 909c348  Log4j 1.2 bridge adds org.apache.log4j.helpers.Loader.
     add 40df4e7  Redo test for to avoid using an existing system property.
     add d91c5e8  Log4j 1.2 bridge adds org.apache.log4j.spi.RootLogger.
     add 31348a9  Log4j 1.2 bridge adds org.apache.log4j.spi.RootLogger.
     add bc0abcd  Log4j 1.2 bridge class Category is missing some protected instance variables.
     add 5be6755  Log4j 1.2 bridge class Category is missing some protected instance variables.
     add 2e22237  Log4j 1.2 bridge adds org.apache.log4j.Hierarchy.
     add 57cf5cd  Log4j 1.2 bridge adds org.apache.log4j.Hierarchy.
     add 0773f7f  Follow current convention of tests being public.
     add 433e738  Follow current convention of test methods being prefixed with "test".
     add 1b1513b  Sort methods.
     add faf8180  Add some API tests.
     add 5a50128  Add org.apache.logging.log4j.core.appender.AsyncAppender.getAppenders() to more easily port from org.apache.log4j.AsyncAppender.getAllAppenders().
     add d0c0c10  Add org.apache.logging.log4j.core.appender.AsyncAppender.getAppenders() to more easily port from org.apache.log4j.AsyncAppender.getAllAppenders().
     add 72866ea  Add org.apache.logging.log4j.core.appender.AsyncAppender.getAppenders() to more easily port from org.apache.log4j.AsyncAppender.getAllAppenders().
     add 8dd8a6a  Revert to 2.17.0 behavior: Read the system property for each call.
     add 06e2ba1  JndiManager reverts to 2.17.0 behavior: Read the system property for each call.
     add 7920561  Use apache-rat-plugin's consoleOutput (and upgrade straggler versions)
     add 1f2ea33  Fix StatusLogger Javadoc (#681)
     add 6c27453  Remove unused private constant.
     add 29f5b74  Log4j 1.2 bridge fixes to structure and behave like 1.2.17.
     add 655c079  Log4j 1.2 bridge methods Category.getChainedPriority() and getEffectiveLevel() should not be final.
     add 9b824f3  Log4j 1.2 bridge methods Category.getChainedPriority() and getEffectiveLevel() should not be final.
     add 54c773d  Log4j 1.2 bridge adds org.apache.log4j.spi.NOPLoggerRepository and NOPLogger.
     add f943a10  Log4j 1.2 bridge adds org.apache.log4j.spi.NOPLoggerRepository and NOPLogger.
     add c8dd8df  Javadoc cleanup.
     add 4c2f5fc  Log4j 1.2 bridge adds org.apache.log4j.spi.DefaultRepositorySelector.
     add 50533c9  Log4j 1.2 bridge adds org.apache.log4j.spi.DefaultRepositorySelector.
     add 4029222  Fix weird Javadoc comment format.
     add 0e2f80f  LOG4J2-3282: log4j-to-jul JDK Logging Bridge (#653)
     add 096fe0e  LOG4J2-3282 changelog
     add 9602f7a  Fix indentation.
     add 6c6b0a2  Add StackLocatorUtil.getCallerClassLoader(int) for the 1.2 bridge.
     add ff33bbc  Add StackLocatorUtil.getCallerClassLoader(int) for the 1.2 bridge.
     add 97f3153  Replace internal use of synchronized java.util.Stack with unsynchronized java.util.Deque. These objects are not shared between threads.
     add 97f9201  Replace internal use of synchronized java.util.Stack with unsynchronized java.util.Deque. These objects are not shared between threads.
     add c61ec4a  Only check if log4j-core is available once.
     add cead0fd  Only check if log4j-core is available once.
     add e1d0624  Only check if log4j-core is available once.
     add d947832  Add missing Javadoc tag.
     add 4fdfb72  Sort members.
     add 5cb37cd  Normalize Javadoc verb.
     add 13a84f2  Use the same Javadoc tag text as master.
     add 82d291f  Javadoc. Format tweaks. Use NIO. Drop single use local.
     add d60546e  Sort methods.
     add fb74349  Add org.apache.logging.log4j.spi.LoggerContext.getLoggerRegistry().
     add bf704c0  Add org.apache.logging.log4j.spi.LoggerContext.getLoggerRegistry().
     add 18301d9  Javadoc tweaks.
     add 19b7faa  Correct a broken markdown link. (#687)
     add e730f06  Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
     add f64791b  Refactor 1.2 bridge internals to use a single private log manager and adapter.
     add aa59026  Refactor 1.2 bridge internals to use a single private log manager and adapter.
     add c463f6a  Log4j 1.2 bridge implements LogManager.getCurrentLoggers() fully.
     add 358a967  LOG4J2-3215 Replace usages of "compile" with "implementation" in the Gradle docs. (#624)
     add 4c49101  Expand SortedArrayStringMap test suite for equals/hashcode/serialization. (#688)
     add 7721b11  Switch to the official Maven Wrapper and upgrade the Maven version to 3.8.4.
     add acb671d  [LOG4J2-3326] Fix parsing filters from Log4j 1.2 properties configuration file (#680)
     add f5ebfcb  [LOG4J2-3326] Fix parsing filters from Log4j 1.2 properties configuration file #680.
     add bef3c24  [LOG4J2-3326] Fix parsing filters from Log4j 1.2 properties configuration file #680.
     add 82b0231  Wording.
     add 8d1ccda  Remove unused private constant.
     add 181b3e1  Bump mongodb3.version from 3.12.4 to 3.12.10 (#605)
     add ea7f044  Bump mongodb3.version from 3.12.4 to 3.12.10 #605.
     add b3c0146  Bump awaitility from 4.0.3 to 4.1.1 (#663)
     add 5188abf  Bump awaitility from 4.0.3 to 4.1.1 #663.
     add 38d417d  Bump spring-boot.version from 2.5.7 to 2.6.2

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   (085e391)
            \
             N -- N -- N   refs/heads/dependabot/maven/spring-boot.version-2.6.2 (38d417d)

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:
 .gitignore                                         |   2 +-
 .mvn/wrapper/maven-wrapper.jar                     | Bin 50710 -> 58727 bytes
 .mvn/wrapper/maven-wrapper.properties              |  35 +-
 README.md                                          |   2 +-
 RELEASE-NOTES.md                                   |  64 ++-
 bin/verify-release-artifacts.sh                    | 134 +++++
 docs/2.17.0-interpolation.md                       |  16 +
 docs/cve-map.md                                    |  16 +
 log4j-1.2-api/pom.xml                              |  27 +-
 .../java/org/apache/log4j/BasicConfigurator.java   |  14 +-
 .../src/main/java/org/apache/log4j/Category.java   | 292 +++++------
 .../java/org/apache/log4j/CategoryKey.java}        |  45 +-
 .../java/org/apache/log4j/ConsoleAppender.java     | 102 +++-
 .../ErrorCode.java => DefaultCategoryFactory.java} |  22 +-
 .../src/main/java/org/apache/log4j/Hierarchy.java  | 567 +++++++++++++++++++++
 .../src/main/java/org/apache/log4j/LogManager.java | 250 ++++-----
 .../src/main/java/org/apache/log4j/Logger.java     |  55 +-
 .../{spi/ErrorCode.java => LoggerRepository2.java} |  18 +-
 .../src/main/java/org/apache/log4j/NDC.java        |  11 +-
 .../main/java/org/apache/log4j/PatternLayout.java  |  11 +
 .../org/apache/log4j/PropertyConfigurator.java     |  77 +--
 .../{spi/ErrorCode.java => ProvisionNode.java}     |  20 +-
 .../org/apache/log4j/builders/AbstractBuilder.java |  45 +-
 .../org/apache/log4j/builders/BuilderManager.java  |  17 +-
 .../builders/appender/NullAppenderBuilder.java     |  12 +-
 .../apache/log4j/component/helpers/Constants.java  | 126 +++++
 .../log4j/config/PropertiesConfiguration.java      |  11 +-
 .../main/java/org/apache/log4j/helpers/Loader.java | 139 +++++
 .../main/java/org/apache/log4j/helpers/LogLog.java | 173 +++++++
 .../org/apache/log4j/helpers/OptionConverter.java  | 141 ++++-
 .../org/apache/log4j/legacy/core/CategoryUtil.java |  34 +-
 .../ErrorCode.java => or/DefaultRenderer.java}     |  33 +-
 .../main/java/org/apache/log4j/or/RendererMap.java | 179 +++++++
 .../java/org/apache/log4j/or/RendererSupport.java  |  26 -
 .../java/org/apache/log4j/spi/Configurator.java    |  43 +-
 ...rorCode.java => DefaultRepositorySelector.java} |  21 +-
 .../src/main/java/org/apache/log4j/spi/Filter.java |  27 +-
 .../java/org/apache/log4j/spi/LoggerFactory.java   |   1 -
 .../main/java/org/apache/log4j/spi/NOPLogger.java  | 268 ++++++++++
 .../org/apache/log4j/spi/NOPLoggerRepository.java  | 154 ++++++
 .../spi/{ErrorCode.java => RendererSupport.java}   |  22 +-
 .../org/apache/log4j/spi/RepositorySelector.java   |  30 +-
 .../main/java/org/apache/log4j/spi/RootLogger.java |  65 +++
 .../spi/{ErrorCode.java => ThrowableRenderer.java} |  23 +-
 ...rrorCode.java => ThrowableRendererSupport.java} |  27 +-
 ...rrorCode.java => TriggeringEventEvaluator.java} |  31 +-
 .../test/java/org/apache/log4j/CategoryTest.java   |   6 +
 .../java/org/apache/log4j/ConsoleAppenderTest.java |  41 +-
 .../org/apache/log4j/CustomAppenderSkeleton.java   |  75 +++
 .../org/apache/log4j/CustomConsoleAppender.java    |  84 +++
 .../java/org/apache/log4j/CustomNoopAppender.java} |  19 +-
 .../org/apache/log4j/CustomWriterAppender.java     |  74 +++
 ...WithPropertiesTest.java => LogManagerTest.java} |  37 +-
 .../src/test/java/org/apache/log4j/NDCTest.java    |  12 +
 .../AbstractLog4j1ConfigurationConverterTest.java  |  34 +-
 .../Log4j1ConfigurationConverterHadoopTest.java    |  18 +-
 .../Log4j1ConfigurationConverterSparkTest.java     |  18 +-
 .../log4j/config/PropertiesConfigurationTest.java  |  91 +++-
 .../src/test/resources/LOG4J2-3281.properties      |  22 +-
 .../src/test/resources/LOG4J2-3326.properties      |  49 +-
 .../log4j-FileAppender-with-props.properties       |  20 +
 log4j-api-java9/pom.xml                            |   2 +-
 log4j-api/pom.xml                                  |   2 +-
 log4j-api/revapi.json                              |   1 +
 .../main/java/org/apache/logging/log4j/Level.java  |   2 +-
 .../java/org/apache/logging/log4j/LogManager.java  |  26 +-
 .../logging/log4j/simple/SimpleLoggerContext.java  |  35 +-
 .../log4j/simple/SimpleLoggerContextFactory.java   |  18 +-
 .../apache/logging/log4j/spi/AbstractLogger.java   |   9 +-
 .../apache/logging/log4j/spi/ExtendedLogger.java   |  52 +-
 .../logging/log4j/spi/ExtendedLoggerWrapper.java   |   3 +-
 .../apache/logging/log4j/spi/LoggerContext.java    | 155 +++---
 .../apache/logging/log4j/status/StatusLogger.java  |   2 +-
 .../util/PrivateSecurityManagerStackTraceUtil.java |   8 +-
 .../apache/logging/log4j/util/PropertiesUtil.java  |   1 -
 .../apache/logging/log4j/util/StackLocator.java    |  76 +--
 .../logging/log4j/util/StackLocatorUtil.java       |  26 +-
 .../logging/log4j/simple/SimpleLoggerTest.java     |   3 +-
 .../log4j/util/SortedArrayStringMapTest.java       |  28 +-
 .../logging/log4j/util/StackLocatorUtilTest.java   |  23 +-
 log4j-appserver/pom.xml                            |   2 +-
 log4j-bom/pom.xml                                  |   4 +-
 log4j-cassandra/pom.xml                            |   5 +-
 .../log4j/cassandra/CassandraAppenderIT.java       |  18 +-
 log4j-core-its/pom.xml                             |   2 +-
 log4j-core-java9/pom.xml                           |   2 +-
 log4j-core/pom.xml                                 |   2 +-
 log4j-core/revapi.json                             |   5 +
 .../apache/logging/log4j/core/LoggerContext.java   |  10 +
 .../logging/log4j/core/appender/AsyncAppender.java |  10 +
 .../appender/AsyncAppenderEventDispatcher.java     |  21 +-
 .../db/jdbc/DataSourceConnectionSource.java        |  20 +-
 .../log4j/core/appender/mom/JmsManager.java        |  11 +-
 .../logging/log4j/core/impl/ThrowableProxy.java    |   6 +-
 .../log4j/core/impl/ThrowableProxyHelper.java      |  12 +-
 .../logging/log4j/core/lookup/Interpolator.java    |   4 -
 .../apache/logging/log4j/core/net/JndiManager.java |  48 +-
 .../apache/logging/log4j/core/tools/Generate.java  |  24 +
 .../apache/logging/log4j/core/util/NetUtils.java   |  48 --
 .../logging/log4j/core/util/OptionConverter.java   |  73 ++-
 .../log4j/core/appender/AsyncAppenderTest.java     | 115 +++--
 .../jdbc/AbstractJdbcAppenderDataSourceTest.java   |  13 +-
 ...stants.java => AbstractJdbcDataSourceTest.java} |  23 +-
 .../db/jdbc/DataSourceConnectionSourceTest.java    |   2 +-
 .../jdbc/JdbcAppenderMapMessageDataSourceTest.java |   2 +-
 .../log4j/core/appender/mom/JmsAppenderTest.java   |   3 +-
 .../log4j/core/async/QueueFullAbstractTest.java    |   2 +-
 .../log4j/core/config/TestConfiguratorError.java   |   2 +-
 .../log4j/core/impl/ThrowableProxyTest.java        |   7 +-
 .../log4j/core/lookup/InterpolatorTest.java        |  10 -
 .../logging/log4j/core/net/JndiManagerTest.java    |  41 +-
 .../log4j/core/util/OptionConverterTest.java       |  59 +++
 .../test/AvailablePortSystemPropertyTestRule.java  |  51 +-
 ...tyTestRule.java => SystemPropertyTestRule.java} |  47 +-
 log4j-couchdb/pom.xml                              |   2 +-
 log4j-distribution/pom.xml                         |   2 +-
 log4j-docker/pom.xml                               |   2 +-
 log4j-flume-ng/pom.xml                             |   2 +-
 log4j-iostreams/pom.xml                            |   2 +-
 log4j-jakarta-web/pom.xml                          |   2 +-
 log4j-jcl/pom.xml                                  |   2 +-
 log4j-jdbc-dbcp2/pom.xml                           |   2 +-
 log4j-jmx-gui/pom.xml                              |   2 +-
 log4j-jpa/pom.xml                                  |   2 +-
 log4j-jpl/pom.xml                                  |   2 +-
 log4j-jul/pom.xml                                  |   2 +-
 log4j-kubernetes/pom.xml                           |   2 +-
 log4j-layout-template-json/pom.xml                 |   2 +-
 log4j-liquibase/pom.xml                            |   2 +-
 log4j-mongodb3/pom.xml                             |   2 +-
 log4j-mongodb4/pom.xml                             |   2 +-
 log4j-osgi/pom.xml                                 |   2 +-
 log4j-perf/pom.xml                                 |   2 +-
 log4j-samples/log4j-samples-configuration/pom.xml  |   2 +-
 log4j-samples/log4j-samples-flume-common/pom.xml   |   2 +-
 log4j-samples/log4j-samples-flume-embedded/pom.xml |   2 +-
 log4j-samples/log4j-samples-flume-remote/pom.xml   |   2 +-
 .../log4j-samples-loggerProperties/pom.xml         |   2 +-
 log4j-samples/pom.xml                              |   2 +-
 log4j-slf4j-impl/pom.xml                           |   2 +-
 log4j-slf4j18-impl/pom.xml                         |   2 +-
 log4j-spring-boot/pom.xml                          |   2 +-
 .../log4j-spring-cloud-config-client/pom.xml       |   2 +-
 .../pom.xml                                        |   2 +-
 .../pom.xml                                        |   4 +-
 .../log4j-spring-cloud-config-samples/pom.xml      |   2 +-
 log4j-spring-cloud-config/pom.xml                  |   2 +-
 log4j-taglib/pom.xml                               |   2 +-
 {log4j-to-slf4j => log4j-to-jul}/pom.xml           |  40 +-
 .../org/apache/logging/log4j/tojul/JULLogger.java  | 267 ++++++++++
 .../logging/log4j/tojul/JULLoggerContext.java      |  18 +-
 .../log4j/tojul/JULLoggerContextFactory.java       | 138 ++---
 .../apache/logging/log4j/tojul/JULProvider.java    |  12 +-
 .../apache/logging/log4j/tojul}/package-info.java  |   8 +-
 .../services/org.apache.logging.log4j.spi.Provider |   7 +-
 .../src/site/markdown/index.md                     |  20 +-
 {log4j-1.2-api => log4j-to-jul}/src/site/site.xml  |   2 +-
 .../org/apache/logging/log4j/tojul/LoggerTest.java | 204 ++++++++
 log4j-to-slf4j/pom.xml                             |   2 +-
 log4j-web/pom.xml                                  |   2 +-
 mvnw                                               |  18 +-
 mvnw.cmd                                           |  30 +-
 pom.xml                                            |  58 ++-
 src/changes/announcement.vm                        |  38 +-
 src/changes/changes.xml                            | 122 ++++-
 src/site/markdown/index.md.vm                      |  74 +--
 src/site/markdown/{ => manual}/api-separation.md   |  68 +--
 src/site/markdown/manual/migration.md              |   3 +
 src/site/markdown/maven-artifacts.md.vm            |   6 +-
 src/site/markdown/security.md                      |  84 ++-
 src/site/site.xml                                  |  15 +-
 src/site/xdoc/manual/appenders.xml                 |  10 +-
 src/site/xdoc/manual/configuration.xml.vm          |  12 +-
 173 files changed, 4945 insertions(+), 1587 deletions(-)
 create mode 100755 bin/verify-release-artifacts.sh
 copy log4j-1.2-api/src/{test/java/org/apache/log4j/MDCTestCase.java => main/java/org/apache/log4j/CategoryKey.java} (56%)
 copy log4j-1.2-api/src/main/java/org/apache/log4j/{spi/ErrorCode.java => DefaultCategoryFactory.java} (66%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/{spi/ErrorCode.java => LoggerRepository2.java} (67%)
 copy log4j-1.2-api/src/main/java/org/apache/log4j/{spi/ErrorCode.java => ProvisionNode.java} (66%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/component/helpers/Constants.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/helpers/Loader.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/helpers/LogLog.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/{spi/ErrorCode.java => or/DefaultRenderer.java} (61%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
 delete mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererSupport.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/{ErrorCode.java => DefaultRepositorySelector.java} (68%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/spi/NOPLogger.java
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/spi/NOPLoggerRepository.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/{ErrorCode.java => RendererSupport.java} (68%)
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/spi/RootLogger.java
 copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/{ErrorCode.java => ThrowableRenderer.java} (69%)
 copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/{ErrorCode.java => ThrowableRendererSupport.java} (64%)
 copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/{ErrorCode.java => TriggeringEventEvaluator.java} (57%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/FileSizeTest.java => log4j-1.2-api/src/test/java/org/apache/log4j/ConsoleAppenderTest.java (54%)
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/CustomAppenderSkeleton.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/CustomConsoleAppender.java
 copy log4j-1.2-api/src/{main/java/org/apache/log4j/ConsoleAppender.java => test/java/org/apache/log4j/CustomNoopAppender.java} (80%)
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/CustomWriterAppender.java
 copy log4j-1.2-api/src/test/java/org/apache/log4j/{config/PropertiesRollingWithPropertiesTest.java => LogManagerTest.java} (50%)
 copy .dockerignore => log4j-1.2-api/src/test/resources/LOG4J2-3281.properties (63%)
 copy .dockerignore => log4j-1.2-api/src/test/resources/LOG4J2-3326.properties (72%)
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-FileAppender-with-props.properties
 copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/{H2TestConstants.java => AbstractJdbcDataSourceTest.java} (64%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/test/{AvailablePortSystemPropertyTestRule.java => SystemPropertyTestRule.java} (60%)
 copy {log4j-to-slf4j => log4j-to-jul}/pom.xml (86%)
 create mode 100644 log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULLogger.java
 copy log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java => log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULLoggerContext.java (78%)
 copy log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java => log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULLoggerContextFactory.java (68%)
 copy log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jProvider.java => log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java (74%)
 copy {log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka => log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul}/package-info.java (74%)
 copy log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume-env.sh => log4j-to-jul/src/main/resources/META-INF/services/org.apache.logging.log4j.spi.Provider (89%)
 copy {log4j-to-slf4j => log4j-to-jul}/src/site/markdown/index.md (68%)
 copy {log4j-1.2-api => log4j-to-jul}/src/site/site.xml (98%)
 create mode 100644 log4j-to-jul/src/test/java/org/apache/logging/log4j/tojul/LoggerTest.java
 rename src/site/markdown/{ => manual}/api-separation.md (76%)