You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/04/11 15:45:12 UTC
[52/52] [abbrv] logging-log4j2 git commit: Merge branch 'master' into
java9NoMultiRelease
Merge branch 'master' into java9NoMultiRelease
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8475d175
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8475d175
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8475d175
Branch: refs/heads/java9NoMultiRelease
Commit: 8475d17597a09006808e747fd82e6ad126227641
Parents: 34552d7 4d6be7b
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Apr 11 08:43:46 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Tue Apr 11 08:43:46 2017 -0700
----------------------------------------------------------------------
BUILDING.md | 2 +-
README.md | 2 +
RELEASE-NOTES.md | 74 +++--
log4j-1.2-api/pom.xml | 2 +-
log4j-api-scala_2.10/pom.xml | 2 +-
log4j-api-scala_2.11/pom.xml | 2 +-
log4j-api/pom.xml | 2 +-
.../org/apache/logging/log4j/ThreadContext.java | 5 +-
log4j-bom/pom.xml | 2 +-
log4j-core-its/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../apache/logging/log4j/core/config/Order.java | 2 +-
.../log4j/core/config/OrderComparator.java | 2 +-
.../builder/api/ConfigurationBuilder.java | 15 +
.../api/KeyValuePairComponentBuilder.java | 25 ++
.../builder/api/PropertyComponentBuilder.java | 25 ++
.../impl/DefaultConfigurationBuilder.java | 11 +
.../DefaultKeyValuePairComponentBuilder.java | 34 ++
.../impl/DefaultPropertyComponentBuilder.java | 32 ++
.../core/net/mom/jms/AbstractJmsReceiver.java | 48 ---
.../core/net/mom/jms/JmsQueueReceiver.java | 46 ---
.../core/net/mom/jms/JmsTopicReceiver.java | 46 ---
.../log4j/core/net/mom/jms/package-info.java | 26 --
.../core/net/server/AbstractLogEventBridge.java | 44 ---
.../core/net/server/AbstractSocketServer.java | 209 ------------
.../net/server/InputStreamLogEventBridge.java | 103 ------
.../log4j/core/net/server/JmsServer.java | 148 ---------
.../server/JsonInputStreamLogEventBridge.java | 90 ------
.../log4j/core/net/server/LogEventBridge.java | 57 ----
.../server/ObjectInputStreamLogEventBridge.java | 45 ---
.../core/net/server/SecureTcpSocketServer.java | 37 ---
.../log4j/core/net/server/TcpSocketServer.java | 314 -------------------
.../log4j/core/net/server/UdpSocketServer.java | 169 ----------
.../server/XmlInputStreamLogEventBridge.java | 54 ----
.../log4j/core/net/server/package-info.java | 24 --
.../core/util/FilteredObjectInputStream.java | 67 ++++
.../core/util/datetime/FixedDateFormat.java | 32 +-
.../builder/ConfigurationAssemblerTest.java | 6 +-
.../builder/ConfigurationBuilderTest.java | 16 +
.../builder/CustomConfigurationFactory.java | 11 +
.../net/server/AbstractSocketServerTest.java | 237 --------------
.../core/net/server/SslXmlSocketServerTest.java | 104 ------
.../net/server/TcpJsonSocketServerTest.java | 62 ----
.../server/TcpSerializedSocketServerTest.java | 63 ----
.../core/net/server/TcpXmlSocketServerTest.java | 65 ----
.../log4j/core/net/server/ThreadIdFilter.java | 40 ---
.../log4j/core/net/server/ThreadNameFilter.java | 39 ---
.../core/net/server/ThreadPriorityFilter.java | 40 ---
.../net/server/UdpJsonSocketServerTest.java | 58 ----
.../server/UdpSerializedSocketServerTest.java | 60 ----
.../core/net/server/UdpXmlSocketServerTest.java | 61 ----
.../core/util/datetime/FixedDateFormatTest.java | 177 ++++++++++-
.../apache/logging/log4j/core/net/ssl/README | 2 +-
log4j-distribution/pom.xml | 2 +-
log4j-distribution/src/assembly/bin.xml | 4 +-
log4j-flume-ng/pom.xml | 2 +-
log4j-iostreams/pom.xml | 2 +-
log4j-jcl/pom.xml | 2 +-
log4j-jmx-gui/pom.xml | 2 +-
log4j-jul/pom.xml | 2 +-
log4j-liquibase/pom.xml | 2 +-
log4j-nosql/pom.xml | 2 +-
log4j-osgi/pom.xml | 2 +-
log4j-perf/pom.xml | 2 +-
log4j-samples/configuration/pom.xml | 2 +-
log4j-samples/flume-common/pom.xml | 2 +-
log4j-samples/flume-embedded/pom.xml | 2 +-
log4j-samples/flume-remote/pom.xml | 2 +-
log4j-samples/loggerProperties/pom.xml | 2 +-
log4j-samples/pom.xml | 2 +-
log4j-samples/scala-api/pom.xml | 2 +-
log4j-slf4j-impl/pom.xml | 2 +-
log4j-taglib/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
log4j-web/pom.xml | 2 +-
pom.xml | 35 ++-
src/changes/changes.xml | 37 ++-
src/site/markdown/maven-artifacts.md.vm | 2 +-
src/site/resources/images/logo.png | Bin 40517 -> 40494 bytes
.../logo/logo-electric-blue-2-2.8.2.png | Bin 0 -> 40494 bytes
.../logo/logo-electric-blue-2-2.8.2.xcf | Bin 0 -> 67168 bytes
.../resources/logo/logo-electric-blue-2.xcf | Bin 0 -> 66097 bytes
src/site/xdoc/manual/appenders.xml | 4 +-
src/site/xdoc/manual/configuration.xml.vm | 99 ++----
src/site/xdoc/runtime-dependencies.xml | 9 +-
86 files changed, 601 insertions(+), 2476 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/log4j-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/log4j-core-its/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/log4j-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/log4j-perf/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/log4j-slf4j-impl/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8475d175/pom.xml
----------------------------------------------------------------------