This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch
dependabot/maven/org.apache.felix-maven-bundle-plugin-5.1.8
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
omit b9fb0ae352 Bump maven-bundle-plugin from 3.5.0 to 5.1.8
add f40c66b6ba Bump github/codeql-action from 2.1.16 to 2.1.17 (#985)
add 8662c06dda Bump docker-maven-plugin from 0.40.1 to 0.40.2 (#991)
add 28efddbcd5 [LOG4J2-3565] Fix RollingRandomAccessFileAppender with
DirectWriteRolloverStrategy can't create the first log file of different
directory.
add 40214e87c4 Fix version typos in security page.
add e08ef96329 Vanity commit
add e1caac6af8 Bump actions/setup-python from 4.1.0 to 4.2.0 (#992)
add 4ed4d281ff Bump github/codeql-action from 2.1.17 to 2.1.18 (#993)
add 4d1d780d0b LOG4J2-3573 Removed build page in favor of a single build
instructions file.
add f0526bce4e LOG4J2-3573 Remove mention of unsupported parallel build.
add 80aae21796 [LOG4J2-3577] Use classloader provided by servlet context
add 092f64370e Revert commit 80aae21
add 767e03020b LOG4J2-3556 Make JsonTemplateLayout stack trace truncation
operate for each label block. (#1002)
add 1e25c58dd2 LOG4J2-3578 - Generate new SSL certs for unit testing
add 528ddcece3 Bump github/codeql-action from 2.1.18 to 2.1.19 (#1005)
add 5d2501a174 (doc) Fix typos in project documentations
add af0f9cf42a Merge pull request #964 from marcwrobel/fix-typos-doc
add 800d4e8296 Fix code typo in BUILDING.md (#1019)
add 73db342e91 [LOG4J2-3370] Initial SLF4J 2.0.x support (#1023)
add 674dae6d55 [LOG4J2-3585] Fix throwable logging
add 18528056fd [LOG4J2-3559] Correct normalization problem.
add a470bf2860 [LOG4J2-3559] Add release notes
add 880acdfdb0 LOG4J2-3579 Calls ServiceLoader with caller's security
context
add 8bd34d946c [LOG4J2-3579]
add ccd807b00b [LOG4J2-3583] Implements stack-valued MDC
add 36cf6420bb [LOG4J2-3583] Add tests from #1022 and release notes
add 8f63620875 [LOG4J2-2975] Implements the SLF4J LoggingEventBuilder
add f64c96b591 [LOG4J2-2975] Add release notes
add 92fe2a654b Sync SLF4J 1.x and 2.x bindings
add 5db57c865d Bump tomcat-juli from 10.0.21 to 10.0.23
add 8f490554ad Bump woodstox-core from 6.2.8 to 6.3.1
add 19d1167e7d Bump jackson2Version from 2.13.3 to 2.13.4
add f299ff7366 Bump netty-all from 4.1.72.Final to 4.1.80.Final
add 76052d12a6 Bump elasticsearch-rest-high-level-client from 7.17.5 to
7.17.6
add a8267c16c5 Bump log4j2-ecs-layout from 1.4.0 to 1.5.0
add 42ee5afcac Bump jmdns from 3.5.7 to 3.5.8
add 18047b96b1 Bump junitJupiterVersion from 5.8.2 to 5.9.0
add 0570611e40 Use `junit-bom`
add e88b4c7a82 Bump json-unit from 2.32.0 to 2.35.0
add 7aa9dd8bfa Fix parsing errors on `null` delimiters
add 53b01c8880 LOG4J2-3588 - Allow a PropertySource to be added
add 84a0f4e137 LOG4J2-3589 - Allow Plugins to be injected with the
LoggerContext reference
add 7f3547a03c Bump github/codeql-action from 2.1.19 to 2.1.22 (#1031)
add 5629ece4e8 LOG4J2-3572 - Add getExplicitLevel to LoggerConfig
add 1470d504b4 [LOG4J2-3587] Add default enterprise ID value
add 51771c777d Correct compilation error
add e8fba8caf1 LOG4J2-3572 - Protect from null value
add d145ec8ba3 LOG4J2-2507 - Add unit test
add 7370a77012 Remove SLF4J 1.8.x binding
add 968371c7a8 Rename `log4j-slf4j20-impl` to `log4j-slf4j2-impl`
add 9afd1f0682 [LOG4J2-3590] Add release notes
add 1a395bdc74 [LOG4J2-3557] Missing release note
add 455933d686 [LOG4J-3587] Changelog
add 57425a5e3a Fix typos (#1021)
add 7e274cb062 LOG4J2-3545 - Add correct manifest entries for OSGi to
log4j-jcl
add ca95a6983d Increases JVM heap memory
add 390e3355c0 Don't replace null password with default if provided
add 60fe5d4437 [[LOG4J2-3548] Improve support of `null` location and
password
add 51f36fd647 [LOG4J2-3548] Add unity tests
add a8b5972c00 [LOG4J-3548] Changelog
add 5ffbbee76b LOG4J2-3589 - Avoid storing strong references to the
LoggerContext
add 9c13b8bbac Prepare for release 2.19.0
add ddd0fa6a25 Repleace SLF4J18 with SLF4J2
add 6fb995e993 [maven-release-plugin] prepare release log4j-2.19.0-rc1
add ee98a7a38e [maven-release-plugin] prepare for next development
iteration
add 3f8ae1ff98 Replace keystore PBKDF
add d6c8075494 Update Flume to latest release
add 50ea400b8d Update artifacts included in the distribution
add cd534c3f2c [maven-release-plugin] prepare release log4j-2.19.0-rc1
add b9c62fbb8a [maven-release-plugin] prepare for next development
iteration
add 4db770bf57 Fix log4j-slf4j*-impl documentation
add a8a6cb586a Replace tabs with spaces
add 432a851f03 [LOG4J2-708] Improve `Log4jServletFilter` async behavior
add ef55c90306 Add release notes
add 750ca9c454 Add missing test scopes
add 5642f32fed Add licence
add 8e34592cb4 Increase `EncodingListAppender` buffer size
add c07927c112 [LOG4J2-3564] Missing changelog
add 4968504171 Revert changelog commit
add afc2b7cc39 Fix typo
add 5a5d3aefdc [maven-release-plugin] prepare release log4j-2.19.0-rc2
add ab90369226 [maven-release-plugin] prepare for next development
iteration
add 249925ab89 Do not deploy GA releases
add e1e834a11d Bump jetty-util from 9.4.48.v20220622 to 9.4.49.v20220914
add 3e3f7939e5 Fix new snapshot version
add cb6db2c28f Bump maven-bundle-plugin from 3.5.0 to 5.1.8
add 4fe13b1b31 Remove internal packages from exports
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 (b9fb0ae352)
\
N -- N -- N
refs/heads/dependabot/maven/org.apache.felix-maven-bundle-plugin-5.1.8
(4fe13b1b31)
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:
.github/workflows/benchmark.yml | 2 +-
.github/workflows/build.yml | 15 +-
.github/workflows/codeql-analysis.yml | 4 +-
.github/workflows/scorecards-analysis.yml | 2 +-
BUILDING.md | 24 +-
README.md | 29 +-
RELEASE-NOTES.md | 152 ++---
log4j-1.2-api/pom.xml | 6 +-
.../src/main/java/org/apache/log4j/Category.java | 4 +-
.../org/apache/log4j/helpers/OptionConverter.java | 2 +-
.../org/apache/log4j/spi/AppenderAttachable.java | 2 +-
.../src/test/java/org/apache/log4j/xml/XLevel.java | 2 +-
log4j-api-java9/pom.xml | 4 +-
.../logging/log4j/util/ServiceLoaderUtil.java | 32 +-
log4j-api/pom.xml | 19 +-
.../java/org/apache/logging/log4j/BridgeAware.java | 22 +-
.../logging/log4j/internal/DefaultLogBuilder.java | 11 +-
.../log4j/util/EnvironmentPropertySource.java | 4 +-
.../log4j/util/PropertiesPropertySource.java | 3 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 54 +-
.../logging/log4j/util/ServiceLoaderUtil.java | 32 +-
.../org/apache/logging/log4j/util/Strings.java | 2 +-
.../log4j/util/EnvironmentPropertySourceTest.java | 1 +
.../log4j/util/Log4jCharsetsPropertiesTest.java | 2 +-
.../log4j/util/PropertiesPropertySourceTest.java | 1 +
.../log4j/util/PropertiesUtilOrderTest.java | 18 +-
.../logging/log4j/util/PropertiesUtilTest.java | 18 +
...mPropertiesPropertySourceSecurityManagerIT.java | 5 +-
log4j-appserver/pom.xml | 4 +-
log4j-bom/pom.xml | 6 +-
log4j-cassandra/pom.xml | 4 +-
log4j-cassandra/src/test/resources/cassandra.yaml | 4 +-
log4j-core-its/pom.xml | 4 +-
.../log4j/core/async/perftest/Histogram.java | 2 +-
.../log4j/core/async/perftest/IdleStrategy.java | 2 +-
log4j-core-java9/pom.xml | 2 +-
log4j-core/pom.xml | 15 +-
.../logging/log4j/core/appender/AppenderSet.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 2 +-
.../rolling/RollingRandomAccessFileManager.java | 10 +-
.../core/appender/routing/RoutingAppender.java | 2 +-
.../async/BasicAsyncLoggerContextSelector.java | 2 +-
.../log4j/core/config/AbstractConfiguration.java | 7 +-
.../logging/log4j/core/config/LoggerConfig.java | 12 +-
...igurationAware.java => LoggerContextAware.java} | 14 +-
.../{PluginNode.java => PluginLoggerContext.java} | 9 +-
...isitor.java => PluginLoggerContextVisitor.java} | 18 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 29 +-
.../logging/log4j/core/lookup/DateLookup.java | 2 +-
.../logging/log4j/core/lookup/Interpolator.java | 18 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 24 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 2 +-
.../core/net/ssl/SslConfigurationFactory.java | 41 +-
.../log4j/core/net/ssl/StoreConfiguration.java | 3 +
.../org/apache/logging/log4j/core/util/Loader.java | 4 +-
.../org/apache/logging/log4j/core/util/Source.java | 2 +-
.../appender/MemoryMappedFileAppenderTest.java | 2 +-
.../core/appender/ReconfigureAppenderTest.java | 2 +-
...llingAppenderDirectCustomDeleteActionTest.java} | 55 +-
...omAppenderDirectWriteAndSwitchDirectorTest.java | 48 ++
.../log4j/core/config/LoggerConfigTest.java | 21 +
.../logging/log4j/core/layout/GelfLayoutTest.java | 55 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 28 +
.../core/net/ssl/KeyStoreConfigurationTest.java | 86 ++-
.../core/net/ssl/SslConfigurationFactoryTest.java | 58 +-
.../logging/log4j/core/net/ssl/TestConstants.java | 14 +
.../log4j/test/appender/EncodingListAppender.java | 4 +-
...=> log4j-rolling-direct-with-custom-delete.xml} | 9 +-
...log4j-rolling-random-direct-switch-director.xml | 49 ++
.../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 +
.../log4j/core/net/ssl/client.log4j2-crt.pem | 32 -
.../core/net/ssl/client.log4j2-keystore-nopass.p12 | Bin 0 -> 3813 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 6829 -> 3520 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.p12 | Bin 0 -> 4023 bytes
.../logging/log4j/core/net/ssl/log4j2-cacert.pem | 32 -
.../log4j/core/net/ssl/server.log4j2-crt.pem | 45 +-
.../log4j/core/net/ssl/server.log4j2-key.pem | 51 --
.../logging/log4j/core/net/ssl/server.log4j2.pem | 23 +
.../log4j/core/net/ssl/syslog-ng-sample.conf | 33 --
.../logging/log4j/core/net/ssl/truststore.jks | Bin 1487 -> 776 bytes
log4j-couchdb/pom.xml | 4 +-
log4j-distribution/pom.xml | 121 +++-
log4j-docker/pom.xml | 2 +-
.../apache/logging/log4j/docker/DockerLookup.java | 2 +-
log4j-flume-ng/pom.xml | 4 +-
.../log4j/flume/appender/FlumeAppender.java | 4 +-
log4j-iostreams/pom.xml | 4 +-
log4j-jakarta-smtp/pom.xml | 4 +-
log4j-jakarta-web/pom.xml | 9 +-
.../log4j/web/Log4jServletContextListener.java | 56 +-
.../logging/log4j/web/Log4jServletFilter.java | 2 +
.../Log4jShutdownOnContextDestroyedListener.java | 10 +-
.../log4j/web/appender/ServletAppender.java | 48 +-
.../log4j/web/Log4jServletContextListenerTest.java | 12 +-
.../logging/log4j/web/Log4jServletFilterTest.java | 7 +-
...og4jShutdownOnContextDestroyedListenerTest.java | 22 +-
.../log4j/web/Log4jWebInitializerImplTest.java | 28 +-
log4j-jcl/pom.xml | 4 +-
log4j-jdbc-dbcp2/pom.xml | 4 +-
log4j-jmx-gui/pom.xml | 2 +-
log4j-jpa/pom.xml | 4 +-
log4j-jpl/pom.xml | 4 +-
log4j-jul/pom.xml | 3 +-
log4j-kubernetes/pom.xml | 4 +-
log4j-layout-template-json/pom.xml | 2 +-
.../template/json/resolver/ExceptionResolver.java | 9 +-
.../json/resolver/StackTraceStringResolver.java | 248 +++++++-
.../template/json/util/CharSequencePointer.java | 106 ++++
.../json/util/TruncatingBufferedPrintWriter.java | 17 +-
.../json/util/TruncatingBufferedWriter.java | 50 +-
.../template/json/JsonTemplateLayoutTest.java | 276 +--------
.../resolver/StackTraceStringResolverTest.java | 657 +++++++++++++++++++++
.../json/util/CharSequencePointerTest.java | 121 ++++
.../json/util/TruncatingBufferedWriterTest.java | 63 +-
log4j-liquibase/pom.xml | 4 +-
log4j-mongodb3/pom.xml | 4 +-
log4j-mongodb4/pom.xml | 4 +-
log4j-osgi/pom.xml | 4 +-
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 | 4 +-
.../java/org/apache/logging/slf4j/Log4jLogger.java | 90 ++-
.../apache/logging/slf4j/Log4jLoggerFactory.java | 14 +-
.../org/apache/logging/slf4j/Log4jMDCAdapter.java | 3 +-
.../java/org/apache/logging/slf4j/Log4jMarker.java | 12 +-
.../apache/logging/slf4j/Log4jMarkerFactory.java | 20 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 3 +-
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 4 +-
log4j-slf4j-impl/src/site/markdown/index.md | 10 +-
.../logging/slf4j/CallerInformationTest.java | 134 ++---
.../org/apache/logging/slf4j/Log4jMarkerTest.java | 15 +-
.../apache/logging/slf4j/LoggerContextTest.java | 6 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 42 +-
.../java/org/apache/logging/slf4j/MarkerTest.java | 26 +-
.../org/apache/logging/slf4j/OverflowTest.java | 7 +-
.../org/apache/logging/slf4j/SerializeTest.java | 92 +--
.../src/test/resources/log4j-test1.xml | 2 +
.../org/apache/logging/slf4j/Log4jMDCAdapter.java | 60 --
{log4j-slf4j18-impl => log4j-slf4j2-impl}/pom.xml | 29 +-
.../apache/logging/slf4j/Log4jEventBuilder.java | 151 +++++
.../java/org/apache/logging/slf4j/Log4jLogger.java | 140 +++--
.../apache/logging/slf4j/Log4jLoggerFactory.java | 1 -
.../org/apache/logging/slf4j/Log4jMDCAdapter.java | 151 +++++
.../java/org/apache/logging/slf4j/Log4jMarker.java | 0
.../apache/logging/slf4j/Log4jMarkerFactory.java | 18 +-
.../logging/slf4j/SLF4JLoggingException.java | 0
.../apache/logging/slf4j/SLF4JServiceProvider.java | 4 +-
.../org/apache/logging/slf4j/package-info.java | 0
.../services/org.slf4j.spi.SLF4JServiceProvider | 0
.../src/site/markdown/index.md | 9 +
.../src/site/site.xml | 0
.../logging/other/pkg/LoggerContextAnchorTest.java | 0
.../logging/slf4j/CallerInformationTest.java | 12 +-
.../org/apache/logging/slf4j/CustomFlatMarker.java | 0
.../org/apache/logging/slf4j/Log4j1222Test.java | 0
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 0
.../logging/slf4j/Log4jEventBuilderTest.java | 67 +++
.../apache/logging/slf4j/Log4jMDCAdapterTest.java | 63 ++
.../org/apache/logging/slf4j/Log4jMarkerTest.java | 0
.../apache/logging/slf4j/LoggerContextTest.java | 0
.../java/org/apache/logging/slf4j/LoggerTest.java | 60 +-
.../java/org/apache/logging/slf4j/MarkerTest.java | 0
.../org/apache/logging/slf4j/OverflowTest.java | 7 +-
.../org/apache/logging/slf4j/SerializeTest.java | 6 +-
.../src/test/resources/log4j-test1.xml | 2 +
.../src/test/resources/log4j2-1482.xml | 0
log4j-spring-boot/pom.xml | 5 +-
...tem.java => Log4j2SpringBootLoggingSystem.java} | 16 +-
.../log4j/spring/boot/SpringEnvironmentHolder.java | 50 --
.../logging/log4j/spring/boot/SpringLookup.java | 42 +-
.../log4j/spring/boot/SpringProfileArbiter.java | 37 +-
.../log4j/spring/boot/SpringPropertySource.java | 10 +-
.../org.apache.logging.log4j.util.PropertySource | 15 -
.../src/main/resources/META-INF/spring.factories | 2 +-
.../spring/boot/Log4j2SpringBootInitTest.java | 2 +
...java => Log4j2SpringBootLoggingSystemTest.java} | 8 +-
.../log4j/spring/boot/SpringLookupTest.java | 10 +-
.../log4j/spring/boot/SpringProfileTest.java | 2 +-
.../log4j-spring-cloud-config-client/pom.xml | 4 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../log4j-spring-cloud-config-samples/pom.xml | 2 +-
log4j-spring-cloud-config/pom.xml | 2 +-
log4j-taglib/pom.xml | 4 +-
log4j-to-jul/pom.xml | 4 +-
log4j-to-slf4j/pom.xml | 4 +-
log4j-web/pom.xml | 11 +-
.../log4j/web/Log4jServletContextListener.java | 56 +-
.../logging/log4j/web/Log4jServletFilter.java | 2 +
.../Log4jShutdownOnContextDestroyedListener.java | 10 +-
.../log4j/web/appender/ServletAppender.java | 48 +-
.../log4j/web/Log4jServletContextListenerTest.java | 12 +-
.../logging/log4j/web/Log4jServletFilterTest.java | 7 +-
...og4jShutdownOnContextDestroyedListenerTest.java | 22 +-
.../log4j/web/Log4jWebInitializerImplTest.java | 28 +-
pom.xml | 84 +--
src/changes/announcement.vm | 5 +-
src/changes/changes.xml | 149 +++--
.../asciidoc/manual/json-template-layout.adoc.vm | 10 +-
src/site/custom/project-info-report.properties | 20 +-
src/site/markdown/articles.md | 2 +-
src/site/markdown/build.md | 69 ---
src/site/markdown/index.md.vm | 4 +-
src/site/markdown/manual/cloud.md | 2 +-
src/site/markdown/manual/migration.md | 6 +-
src/site/markdown/security.md | 34 +-
src/site/site.xml | 1 -
src/site/xdoc/guidelines.xml | 2 +-
src/site/xdoc/manual/appenders.xml | 12 +-
src/site/xdoc/manual/async.xml | 14 +-
src/site/xdoc/manual/configuration.xml.vm | 4 +-
src/site/xdoc/manual/customconfig.xml | 2 +-
src/site/xdoc/manual/extending.xml | 2 +-
src/site/xdoc/manual/flowtracing.xml | 2 +-
src/site/xdoc/manual/garbagefree.xml | 6 +-
src/site/xdoc/manual/index.xml | 2 +-
src/site/xdoc/manual/lookups.xml | 8 +-
src/site/xdoc/manual/markers.xml | 2 +-
src/site/xdoc/manual/usage.xml | 4 +-
src/site/xdoc/manual/webapp.xml | 6 +-
src/site/xdoc/performance.xml | 16 +-
src/site/xdoc/runtime-dependencies.xml | 2 +-
src/tools/sort-pom.xslt | 55 ++
230 files changed, 3796 insertions(+), 1766 deletions(-)
copy
log4j-core/src/test/java/org/apache/logging/log4j/ThreadContextTestAccess.java
=> log4j-api/src/main/java/org/apache/logging/log4j/BridgeAware.java (68%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/config/{ConfigurationAware.java
=> LoggerContextAware.java} (72%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/{PluginNode.java
=> PluginLoggerContext.java} (84%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/{PluginConfigurationVisitor.java
=> PluginLoggerContextVisitor.java} (71%)
copy
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/{RollingAppenderCustomDeleteActionTest.java
=> RollingAppenderDirectCustomDeleteActionTest.java} (65%)
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAppenderDirectWriteAndSwitchDirectorTest.java
copy log4j-core/src/test/resources/{log4j-rolling-with-custom-delete.xml =>
log4j-rolling-direct-with-custom-delete.xml} (81%)
create mode 100644
log4j-core/src/test/resources/log4j-rolling-random-direct-switch-director.xml
create mode 100755
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/gencerts.sh
create mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/rootca.conf
create mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/server.conf
delete mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-crt.pem
create mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore-nopass.p12
create mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore.p12
delete mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/log4j2-cacert.pem
delete mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2-key.pem
create mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2.pem
delete mode 100644
log4j-core/src/test/resources/org/apache/logging/log4j/core/net/ssl/syslog-ng-sample.conf
create mode 100644
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointer.java
create mode 100644
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java
create mode 100644
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointerTest.java
delete mode 100644
log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
rename {log4j-slf4j18-impl => log4j-slf4j2-impl}/pom.xml (92%)
create mode 100644
log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/Log4jLogger.java (68%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
(99%)
create mode 100644
log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java
(89%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java
(93%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/java/org/apache/logging/slf4j/package-info.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
(100%)
rename {log4j-slf4j18-impl => log4j-slf4j2-impl}/src/site/markdown/index.md
(77%)
rename {log4j-slf4j18-impl => log4j-slf4j2-impl}/src/site/site.xml (100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
(81%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java
(100%)
create mode 100644
log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java
create mode 100644
log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java
(100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/LoggerTest.java (68%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/MarkerTest.java (100%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/OverflowTest.java
(93%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/java/org/apache/logging/slf4j/SerializeTest.java
(96%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/resources/log4j-test1.xml (91%)
rename {log4j-slf4j18-impl =>
log4j-slf4j2-impl}/src/test/resources/log4j2-1482.xml (100%)
rename
log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/{Log4j2CloudConfigLoggingSystem.java
=> Log4j2SpringBootLoggingSystem.java} (94%)
delete mode 100644
log4j-spring-boot/src/main/java/org/apache/logging/log4j/spring/boot/SpringEnvironmentHolder.java
delete mode 100644
log4j-spring-boot/src/main/resources/META-INF/services/org.apache.logging.log4j.util.PropertySource
rename
log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/{Log4j2CloudConfigLoggingSystemTest.java
=> Log4j2SpringBootLoggingSystemTest.java} (87%)
delete mode 100644 src/site/markdown/build.md
create mode 100644 src/tools/sort-pom.xslt
