You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/04/10 09:00:26 UTC
[01/27] logging-log4j2 git commit: Correct errors in the comments of
Order and OrderComparator
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1851 6fd6dfcd7 -> ea14d1ce1
Correct errors in the comments of Order and OrderComparator
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6896e396
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6896e396
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6896e396
Branch: refs/heads/LOG4J2-1851
Commit: 6896e3966946863843a0711f40eac39a9d2ac35e
Parents: 5aff929
Author: wangyuntao <wa...@mokylin.com>
Authored: Sat Apr 1 14:18:47 2017 +0800
Committer: wangyuntao <wa...@mokylin.com>
Committed: Sat Apr 1 14:18:47 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/config/Order.java | 2 +-
.../java/org/apache/logging/log4j/core/config/OrderComparator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6896e396/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Order.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Order.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Order.java
index 056a82a..e6c1094 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Order.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Order.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
public @interface Order {
/**
- * The priority of this annotated type. Larger numbers indicate lower priority with a lowest priority of
+ * The priority of this annotated type. Larger numbers indicate higher priority with a highest priority of
* {@link Integer#MAX_VALUE}.
*/
int value();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6896e396/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
index a3b06fe..a0e2b0e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
@@ -54,7 +54,7 @@ public class OrderComparator implements Comparator<Class<?>>, Serializable {
if (lhsOrder == null) {
return 1;
}
- // larger value means lower priority
+ // larger value means higher priority
return Integer.signum(rhsOrder.value() - lhsOrder.value());
}
}
[04/27] logging-log4j2 git commit: Merge commit 'refs/pull/69/head'
of https://github.com/apache/logging-log4j2
Posted by mi...@apache.org.
Merge commit 'refs/pull/69/head' of https://github.com/apache/logging-log4j2
Related to LOG4J2-1862.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3bc94c0b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3bc94c0b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3bc94c0b
Branch: refs/heads/LOG4J2-1851
Commit: 3bc94c0bbe07719affb38c08124bd917a061d3fa
Parents: 000de2c 6896e39
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 12:55:28 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 12:55:28 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/config/Order.java | 2 +-
.../java/org/apache/logging/log4j/core/config/OrderComparator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[26/27] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1851
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1851
# Conflicts:
# src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/394c30f5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/394c30f5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/394c30f5
Branch: refs/heads/LOG4J2-1851
Commit: 394c30f594c9eac570a43313bf44be4bc60cded9
Parents: 6fd6dfc 1475bd9
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Apr 10 10:59:27 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Apr 10 10:59:27 2017 +0200
----------------------------------------------------------------------
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 +-
.../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/util/FilteredObjectInputStream.java | 67 +++++++++++++++++
.../builder/ConfigurationAssemblerTest.java | 6 +-
.../builder/ConfigurationBuilderTest.java | 16 ++++
.../builder/CustomConfigurationFactory.java | 11 +++
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/server/AbstractSocketServer.java | 13 ++++
.../server/ObjectInputStreamLogEventBridge.java | 23 +++++-
.../logging/log4j/server/TcpSocketServer.java | 25 ++++++-
.../logging/log4j/server/UdpSocketServer.java | 18 ++++-
log4j-slf4j-impl/pom.xml | 2 +-
log4j-taglib/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
log4j-web/pom.xml | 2 +-
pom.xml | 31 +++++---
src/changes/changes.xml | 26 ++++++-
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
56 files changed, 437 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/394c30f5/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
----------------------------------------------------------------------
diff --cc log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index a8f1140,0000000..aff7eb1
mode 100644,000000..100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@@ -1,209 -1,0 +1,222 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URL;
++import java.util.Collections;
++import java.util.List;
+import java.util.Objects;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.validators.PositiveInteger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.xml.XmlConfiguration;
+import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory;
+import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
+import org.apache.logging.log4j.core.util.InetAddressConverter;
+import org.apache.logging.log4j.core.util.Log4jThread;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Abstract socket server for TCP and UDP implementations.
+ *
+ * @param <T>
+ * The kind of input stream read
+ *
+ * TODO Make a LifeCycle
+ */
+public abstract class AbstractSocketServer<T extends InputStream> extends LogEventListener implements Runnable {
+
+ protected static class CommandLineArguments extends BasicCommandLineArguments {
+
+ @Parameter(names = { "--config", "-c" }, description = "Log4j configuration file location (path or URL).")
+ private String configLocation;
+
+ @Parameter(names = { "--interactive",
+ "-i" }, description = "Accepts commands on standard input (\"exit\" is the only command).")
+ private boolean interactive;
+
+ @Parameter(names = { "--port",
+ "-p" }, validateWith = PositiveInteger.class, description = "Server socket port.")
+ private int port;
+
+ @Parameter(names = { "--localbindaddress",
+ "-a" }, converter = InetAddressConverter.class, description = "Server socket local bind address.")
+ private InetAddress localBindAddress;
+
++ @Parameter(names = {"--classes", "-C"}, description = "Additional classes to allow deserialization")
++ private List<String> allowedClasses;
++
+ String getConfigLocation() {
+ return configLocation;
+ }
+
+ int getPort() {
+ return port;
+ }
+
+ protected boolean isInteractive() {
+ return interactive;
+ }
+
+ void setConfigLocation(final String configLocation) {
+ this.configLocation = configLocation;
+ }
+
+ void setInteractive(final boolean interactive) {
+ this.interactive = interactive;
+ }
+
+ void setPort(final int port) {
+ this.port = port;
+ }
+
+ InetAddress getLocalBindAddress() {
+ return localBindAddress;
+ }
+
+ void setLocalBindAddress(final InetAddress localBindAddress) {
+ this.localBindAddress = localBindAddress;
+ }
++
++ List<String> getAllowedClasses() {
++ return allowedClasses == null ? Collections.<String>emptyList() : allowedClasses;
++ }
++
++ void setAllowedClasses(final List<String> allowedClasses) {
++ this.allowedClasses = allowedClasses;
++ }
+ }
+
+ /**
+ * Factory that creates a Configuration for the server.
+ */
+ protected static class ServerConfigurationFactory extends XmlConfigurationFactory {
+
+ private final String path;
+
+ public ServerConfigurationFactory(final String path) {
+ this.path = path;
+ }
+
+ @Override
+ public Configuration getConfiguration(final LoggerContext loggerContext, final String name,
+ final URI configLocation) {
+ if (Strings.isNotEmpty(path)) {
+ File file = null;
+ ConfigurationSource source = null;
+ try {
+ file = new File(path);
+ final FileInputStream is = new FileInputStream(file);
+ source = new ConfigurationSource(is, file);
+ } catch (final FileNotFoundException ignored) {
+ // Ignore this error
+ }
+ if (source == null) {
+ try {
+ final URL url = new URL(path);
+ source = new ConfigurationSource(url.openStream(), url);
+ } catch (final IOException ignored) {
+ // Ignore this error
+ }
+ }
+
+ try {
+ if (source != null) {
+ return new XmlConfiguration(loggerContext, source);
+ }
+ } catch (final Exception ignored) {
+ // Ignore this error.
+ }
+ System.err.println("Unable to process configuration at " + path + ", using default.");
+ }
+ return super.getConfiguration(loggerContext, name, configLocation);
+ }
+ }
+
+ protected static final int MAX_PORT = 65534;
+
+ private volatile boolean active = true;
+
+ protected final LogEventBridge<T> logEventInput;
+
+ protected final Logger logger;
+
+ /**
+ * Creates a new socket server.
+ *
+ * @param port
+ * listen to this port
+ * @param logEventInput
+ * Use this input to read log events.
+ */
+ public AbstractSocketServer(final int port, final LogEventBridge<T> logEventInput) {
+ this.logger = LogManager.getLogger(this.getClass().getName() + '.' + port);
+ this.logEventInput = Objects.requireNonNull(logEventInput, "LogEventInput");
+ }
+
+ protected boolean isActive() {
+ return this.active;
+ }
+
+ protected void setActive(final boolean isActive) {
+ this.active = isActive;
+ }
+
+ /**
+ * Start this server in a new thread.
+ *
+ * @return the new thread that running this server.
+ */
+ public Thread startNewThread() {
+ final Thread thread = new Log4jThread(this);
+ thread.start();
+ return thread;
+ }
+
+ public abstract void shutdown() throws Exception;
+
+ public void awaitTermination(final Thread serverThread) throws Exception {
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+ while (true) {
+ final String line = reader.readLine();
+ if (line == null
+ || line.equalsIgnoreCase("quit")
+ || line.equalsIgnoreCase("stop")
+ || line.equalsIgnoreCase("exit")) {
+ this.shutdown();
+ serverThread.join();
+ break;
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/394c30f5/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
----------------------------------------------------------------------
diff --cc log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 9f22b22,0000000..ddd2e26
mode 100644,000000..100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@@ -1,45 -1,0 +1,64 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
++import java.util.Collections;
++import java.util.List;
+
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.LogEventListener;
++import org.apache.logging.log4j.core.util.FilteredObjectInputStream;
+
+/**
+ * Reads and logs serialized {@link LogEvent} objects from an {@link ObjectInputStream}.
+ */
+public class ObjectInputStreamLogEventBridge extends AbstractLogEventBridge<ObjectInputStream> {
+
++ private final List<String> allowedClasses;
++
++ public ObjectInputStreamLogEventBridge() {
++ this(Collections.<String>emptyList());
++ }
++
++ /**
++ * Constructs an ObjectInputStreamLogEventBridge with additional allowed classes to deserialize.
++ *
++ * @param allowedClasses class names to also allow for deserialization
++ * @since 2.8.2
++ */
++ public ObjectInputStreamLogEventBridge(final List<String> allowedClasses) {
++ this.allowedClasses = allowedClasses;
++ }
++
+ @Override
+ public void logEvents(final ObjectInputStream inputStream, final LogEventListener logEventListener)
- throws IOException {
++ throws IOException {
+ try {
+ logEventListener.log((LogEvent) inputStream.readObject());
+ } catch (final ClassNotFoundException e) {
+ throw new IOException(e);
+ }
+ }
+
+ @Override
+ public ObjectInputStream wrapStream(final InputStream inputStream) throws IOException {
- return new ObjectInputStream(inputStream);
++ return new FilteredObjectInputStream(inputStream, allowedClasses);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/394c30f5/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
----------------------------------------------------------------------
diff --cc log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 7856969,0000000..9a5521c
mode 100644,000000..100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@@ -1,314 -1,0 +1,333 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.server;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.OptionalDataException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
++import java.util.Collections;
++import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.validators.PositiveInteger;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
+import org.apache.logging.log4j.core.util.Closer;
+import org.apache.logging.log4j.core.util.Log4jThread;
+import org.apache.logging.log4j.message.EntryMessage;
+
+/**
+ * Listens for Log4j events on a TCP server socket and passes them on to Log4j.
+ *
+ * @param <T>
+ * The kind of input stream read
+ * @see #main(String[])
+ */
+public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer<T> {
+
+ protected static class CommandLineArguments extends AbstractSocketServer.CommandLineArguments {
+
+ @Parameter(names = { "--backlog",
+ "-b" }, validateWith = PositiveInteger.class, description = "Server socket backlog.")
+ // Same default as ServerSocket
+ private int backlog = 50;
+
+ int getBacklog() {
+ return backlog;
+ }
+
+ void setBacklog(final int backlog) {
+ this.backlog = backlog;
+ }
+
+ }
+
+ /**
+ * Thread that processes the events.
+ */
+ private class SocketHandler extends Log4jThread {
+
+ private final T inputStream;
+
+ private volatile boolean shutdown = false;
+
+ public SocketHandler(final Socket socket) throws IOException {
+ this.inputStream = logEventInput.wrapStream(socket.getInputStream());
+ }
+
+ @Override
+ public void run() {
+ final EntryMessage entry = logger.traceEntry();
+ boolean closed = false;
+ try {
+ try {
+ while (!shutdown) {
+ logEventInput.logEvents(inputStream, TcpSocketServer.this);
+ }
+ } catch (final EOFException e) {
+ closed = true;
+ } catch (final OptionalDataException e) {
+ logger.error("OptionalDataException eof=" + e.eof + " length=" + e.length, e);
+ } catch (final IOException e) {
+ logger.error("IOException encountered while reading from socket", e);
+ }
+ if (!closed) {
+ Closer.closeSilently(inputStream);
+ }
+ } finally {
+ handlers.remove(Long.valueOf(getId()));
+ }
+ logger.traceExit(entry);
+ }
+
+ public void shutdown() {
+ this.shutdown = true;
+ interrupt();
+ }
+ }
+
+ /**
+ * Creates a socket server that reads JSON log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static TcpSocketServer<InputStream> createJsonSocketServer(final int port) throws IOException {
+ LOGGER.entry("createJsonSocketServer", port);
+ final TcpSocketServer<InputStream> socketServer = new TcpSocketServer<>(port, new JsonInputStreamLogEventBridge());
+ return LOGGER.exit(socketServer);
+ }
+
+ /**
+ * Creates a socket server that reads serialized log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port) throws IOException {
+ LOGGER.entry(port);
+ final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
+ return LOGGER.exit(socketServer);
+ }
+
+ /**
+ * Creates a socket server that reads serialized log events.
+ *
+ * @param port the port to listen
+ * @param localBindAddress The server socket's local bin address
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ * @since 2.7
+ */
+ public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port, final int backlog,
+ final InetAddress localBindAddress) throws IOException {
++ return createSerializedSocketServer(port, backlog, localBindAddress, Collections.<String>emptyList());
++ }
++
++ /**
++ * Creates a socket server that reads serialized log events.
++ *
++ * @param port the port to listen
++ * @param localBindAddress The server socket's local bin address
++ * @param allowedClasses additional class names to allow for deserialization
++ * @return a new a socket server
++ * @throws IOException
++ * if an I/O error occurs when opening the socket.
++ * @since 2.8.2
++ */
++ public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(
++ final int port, final int backlog, final InetAddress localBindAddress, final List<String> allowedClasses
++ ) throws IOException {
+ LOGGER.entry(port);
+ final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, backlog, localBindAddress,
- new ObjectInputStreamLogEventBridge());
++ new ObjectInputStreamLogEventBridge(allowedClasses));
+ return LOGGER.exit(socketServer);
+ }
+
+ /**
+ * Creates a socket server that reads XML log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static TcpSocketServer<InputStream> createXmlSocketServer(final int port) throws IOException {
+ LOGGER.entry(port);
+ final TcpSocketServer<InputStream> socketServer = new TcpSocketServer<>(port, new XmlInputStreamLogEventBridge());
+ return LOGGER.exit(socketServer);
+ }
+
+ /**
+ * Main startup for the server. Run with "--help" for to print command line help on the console.
+ *
+ * @param args
+ * The command line arguments.
+ * @throws Exception
+ * if an error occurs.
+ */
+ public static void main(final String[] args) throws Exception {
+ final CommandLineArguments cla = BasicCommandLineArguments.parseCommandLine(args, TcpSocketServer.class, new CommandLineArguments());
+ if (cla.isHelp()) {
+ return;
+ }
+ if (cla.getConfigLocation() != null) {
+ ConfigurationFactory.setConfigurationFactory(new ServerConfigurationFactory(cla.getConfigLocation()));
+ }
- final TcpSocketServer<ObjectInputStream> socketServer = TcpSocketServer
- .createSerializedSocketServer(cla.getPort(), cla.getBacklog(), cla.getLocalBindAddress());
++ final TcpSocketServer<ObjectInputStream> socketServer = TcpSocketServer.createSerializedSocketServer(
++ cla.getPort(), cla.getBacklog(), cla.getLocalBindAddress(), cla.getAllowedClasses());
+ final Thread serverThread = socketServer.startNewThread();
+ if (cla.isInteractive()) {
+ socketServer.awaitTermination(serverThread);
+ }
+ }
+
+ private final ConcurrentMap<Long, SocketHandler> handlers = new ConcurrentHashMap<>();
+
+ private final ServerSocket serverSocket;
+
+ /**
+ * Constructor.
+ *
+ * @param port
+ * The server socket port.
+ * @param backlog
+ * The server socket backlog.
+ * @param localBindAddress TODO
+ * @param logEventInput
+ * the log even input
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ * @since 2.7
+ */
+ @SuppressWarnings("resource")
+ public TcpSocketServer(final int port, final int backlog, final InetAddress localBindAddress, final LogEventBridge<T> logEventInput) throws IOException {
+ this(port, logEventInput, new ServerSocket(port, backlog, localBindAddress));
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param port
+ * to listen.
+ * @param logEventInput
+ * the log even input
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public TcpSocketServer(final int port, final LogEventBridge<T> logEventInput) throws IOException {
+ this(port, logEventInput, extracted(port));
+ }
+
+ private static ServerSocket extracted(final int port) throws IOException {
+ return new ServerSocket(port);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param port
+ * to listen.
+ * @param logEventInput
+ * the log even input
+ * @param serverSocket
+ * the socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public TcpSocketServer(final int port, final LogEventBridge<T> logEventInput, final ServerSocket serverSocket)
+ throws IOException {
+ super(port, logEventInput);
+ this.serverSocket = serverSocket;
+ }
+
+ /**
+ * Accept incoming events and processes them.
+ */
+ @Override
+ public void run() {
+ final EntryMessage entry = logger.traceEntry();
+ while (isActive()) {
+ if (serverSocket.isClosed()) {
+ return;
+ }
+ try {
+ // Accept incoming connections.
+ logger.debug("Listening for a connection {}...", serverSocket);
+ final Socket clientSocket = serverSocket.accept();
+ logger.debug("Acepted connection on {}...", serverSocket);
+ logger.debug("Socket accepted: {}", clientSocket);
+ clientSocket.setSoLinger(true, 0);
+
+ // accept() will block until a client connects to the server.
+ // If execution reaches this point, then it means that a client
+ // socket has been accepted.
+
+ final SocketHandler handler = new SocketHandler(clientSocket);
+ handlers.put(Long.valueOf(handler.getId()), handler);
+ handler.start();
+ } catch (final IOException e) {
+ if (serverSocket.isClosed()) {
+ // OK we're done.
+ logger.traceExit(entry);
+ return;
+ }
+ logger.error("Exception encountered on accept. Ignoring. Stack trace :", e);
+ }
+ }
+ for (final Map.Entry<Long, SocketHandler> handlerEntry : handlers.entrySet()) {
+ final SocketHandler handler = handlerEntry.getValue();
+ handler.shutdown();
+ try {
+ handler.join();
+ } catch (final InterruptedException ignored) {
+ // Ignore the exception
+ }
+ }
+ logger.traceExit(entry);
+ }
+
+ /**
+ * Shutdown the server.
+ *
+ * @throws IOException if the server socket could not be closed
+ */
+ @Override
+ public void shutdown() throws IOException {
+ final EntryMessage entry = logger.traceEntry();
+ setActive(false);
+ Thread.currentThread().interrupt();
+ serverSocket.close();
+ logger.traceExit(entry);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/394c30f5/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
----------------------------------------------------------------------
diff --cc log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index a2bac17,0000000..12a8450
mode 100644,000000..100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@@ -1,169 -1,0 +1,185 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.server;
+
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.OptionalDataException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
++import java.util.List;
+
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
+
+/**
+ * Listens for Log4j events on a datagram socket and passes them on to Log4j.
+ *
+ * @param <T>
+ * The kind of input stream read
+ * @see #main(String[])
+ */
+public class UdpSocketServer<T extends InputStream> extends AbstractSocketServer<T> {
+
+ /**
+ * Creates a socket server that reads JSON log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static UdpSocketServer<InputStream> createJsonSocketServer(final int port) throws IOException {
+ return new UdpSocketServer<>(port, new JsonInputStreamLogEventBridge());
+ }
+
+ /**
+ * Creates a socket server that reads serialized log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static UdpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port) throws IOException {
+ return new UdpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
+ }
+
+ /**
++ * Creates a socket server that reads serialized log events.
++ *
++ * @param port the port to listen
++ * @param allowedClasses additional classes to allow for deserialization
++ * @return a new a socket server
++ * @throws IOException if an I/O error occurs when opening the socket.
++ * @since 2.8.2
++ */
++ public static UdpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port,
++ final List<String> allowedClasses)
++ throws IOException {
++ return new UdpSocketServer<>(port, new ObjectInputStreamLogEventBridge(allowedClasses));
++ }
++
++ /**
+ * Creates a socket server that reads XML log events.
+ *
+ * @param port
+ * the port to listen
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ */
+ public static UdpSocketServer<InputStream> createXmlSocketServer(final int port) throws IOException {
+ return new UdpSocketServer<>(port, new XmlInputStreamLogEventBridge());
+ }
+
+ /**
+ * Main startup for the server. Run with "--help" for to print command line help on the console.
+ *
+ * @param args
+ * The command line arguments.
+ * @throws Exception
+ * if an error occurs.
+ */
+ public static void main(final String[] args) throws Exception {
+ final CommandLineArguments cla = BasicCommandLineArguments.parseCommandLine(args, UdpSocketServer.class, new CommandLineArguments());
+ if (cla.isHelp()) {
+ return;
+ }
+ if (cla.getConfigLocation() != null) {
+ ConfigurationFactory.setConfigurationFactory(new ServerConfigurationFactory(cla.getConfigLocation()));
+ }
+ final UdpSocketServer<ObjectInputStream> socketServer = UdpSocketServer
- .createSerializedSocketServer(cla.getPort());
++ .createSerializedSocketServer(cla.getPort(), cla.getAllowedClasses());
+ final Thread serverThread = socketServer.startNewThread();
+ if (cla.isInteractive()) {
+ socketServer.awaitTermination(serverThread);
+ }
+ }
+
+ private final DatagramSocket datagramSocket;
+
+ // max size so we only have to deal with one packet
+ private final int maxBufferSize = 1024 * 65 + 1024;
+
+ /**
+ * Constructor.
+ *
+ * @param port
+ * to listen on.
+ * @param logEventInput
+ * @throws IOException
+ * If an error occurs.
+ */
+ public UdpSocketServer(final int port, final LogEventBridge<T> logEventInput) throws IOException {
+ super(port, logEventInput);
+ this.datagramSocket = new DatagramSocket(port);
+ }
+
+ /**
+ * Accept incoming events and processes them.
+ */
+ @Override
+ public void run() {
+ while (isActive()) {
+ if (datagramSocket.isClosed()) {
+ // OK we're done.
+ return;
+ }
+ try {
+ final byte[] buf = new byte[maxBufferSize];
+ final DatagramPacket packet = new DatagramPacket(buf, buf.length);
+ datagramSocket.receive(packet);
+ final ByteArrayInputStream bais = new ByteArrayInputStream(packet.getData(), packet.getOffset(), packet.getLength());
+ logEventInput.logEvents(logEventInput.wrapStream(bais), this);
+ } catch (final OptionalDataException e) {
+ if (datagramSocket.isClosed()) {
+ // OK we're done.
+ return;
+ }
+ logger.error("OptionalDataException eof=" + e.eof + " length=" + e.length, e);
+ } catch (final EOFException e) {
+ if (datagramSocket.isClosed()) {
+ // OK we're done.
+ return;
+ }
+ logger.info("EOF encountered");
+ } catch (final IOException e) {
+ if (datagramSocket.isClosed()) {
+ // OK we're done.
+ return;
+ }
+ logger.error("Exception encountered on accept. Ignoring. Stack Trace :", e);
+ }
+ }
+ }
+
+ /**
+ * Shutdown the server.
+ */
+ @Override
+ public void shutdown() {
+ this.setActive(false);
+ Thread.currentThread().interrupt();
+ datagramSocket.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/394c30f5/pom.xml
----------------------------------------------------------------------
[03/27] logging-log4j2 git commit: [LOG4J2-1861] Fix ThreadContext
javadoc about inheritance
Posted by mi...@apache.org.
[LOG4J2-1861] Fix ThreadContext javadoc about inheritance
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/000de2cd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/000de2cd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/000de2cd
Branch: refs/heads/LOG4J2-1851
Commit: 000de2cde6a745c945e7575313ac6fbe841a4b49
Parents: 5dcc192
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 12:52:49 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 12:52:49 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/ThreadContext.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/000de2cd/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
index 8b4fa0e..b37b0f9 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
@@ -41,9 +41,10 @@ import org.apache.logging.log4j.util.PropertiesUtil;
/**
* The ThreadContext allows applications to store information either in a Map or a Stack.
* <p>
- * <b><em>The MDC is managed on a per thread basis</em></b>. A child thread automatically inherits a <em>copy</em> of
- * the mapped diagnostic context of its parent.
+ * <b><em>The MDC is managed on a per thread basis</em></b>. To enable automatic inheritance of <i>copies</i> of the MDC
+ * to newly created threads, enable the {@value DefaultThreadContextMap#INHERITABLE_MAP} Log4j system property.
* </p>
+ * @see <a href="https://logging.apache.org/log4j/2.x/manual/thread-context.html">Thread Context Manual</a>
*/
public final class ThreadContext {
[27/27] logging-log4j2 git commit: Update changelog
Posted by mi...@apache.org.
Update changelog
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ea14d1ce
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ea14d1ce
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ea14d1ce
Branch: refs/heads/LOG4J2-1851
Commit: ea14d1ce1e741782bc649a1ea1f3517317a11605
Parents: 394c30f
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Apr 10 10:59:49 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Apr 10 10:59:49 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ea14d1ce/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1c6a7f8..ab3a5b0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1851" dev="mikes" type="update">
+ Move server components from log4j-core to new log4-server module.
+ </action>
<action issue="LOG4J2-1860" dev="mikes" type="add">
Shortcut to add Property and KeyValuePair component in ConfigurationBuilder.
</action>
[19/27] logging-log4j2 git commit: Upadate Apache Active MQ from
5.14.3 to 5.14.4 for testing.
Posted by mi...@apache.org.
Upadate Apache Active MQ from 5.14.3 to 5.14.4 for testing.
Builds OK locally with 'mvn clean install' and Apache Maven 3.5.0
(ff8f5e7444045639af65f6095c62210b5713f426; 2017-04-03T12:39:06-07:00)
Maven home: C:\Java\apache-maven-3.5.0\bin\..
Java version: 1.7.0_80, vendor: Oracle Corporation
Java home: C:\Program Files\Java\jdk1.7.0_80\jre
Default locale: en_US, platform encoding: Cp1252
OS name: "windows 8.1", version: "6.3", arch: "amd64", family: "windows"
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/90a8f79c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/90a8f79c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/90a8f79c
Branch: refs/heads/LOG4J2-1851
Commit: 90a8f79cf66370aad1caa8e598449cffd6c465f8
Parents: 8b79701
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Apr 7 17:47:09 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Apr 7 17:47:09 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/90a8f79c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e96bd8f..0e1bbce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>4.3.1</osgi.api.version>
- <activemq.version>5.14.3</activemq.version>
+ <activemq.version>5.14.4</activemq.version>
<!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
<minSeverity>info</minSeverity>
<jctoolsVersion>1.2.1</jctoolsVersion>
[24/27] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1860
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1860
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f64ea4b5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f64ea4b5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f64ea4b5
Branch: refs/heads/LOG4J2-1851
Commit: f64ea4b597ee6cef22c99ed5f382489ff87431c8
Parents: df1b3e8 c4b4836
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Apr 10 10:46:56 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Apr 10 10:46:56 2017 +0200
----------------------------------------------------------------------
pom.xml | 8 ++++----
src/changes/changes.xml | 11 +++++++++++
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[10/27] logging-log4j2 git commit: Fix release notes file name in
assembly configuration
Posted by mi...@apache.org.
Fix release notes file name in assembly configuration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9003d0e6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9003d0e6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9003d0e6
Branch: refs/heads/LOG4J2-1851
Commit: 9003d0e6cba4f278326c91c5f25252973de4a254
Parents: 0a6da7e
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 14:45:13 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 14:45:13 2017 -0500
----------------------------------------------------------------------
log4j-distribution/src/assembly/bin.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9003d0e6/log4j-distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/log4j-distribution/src/assembly/bin.xml b/log4j-distribution/src/assembly/bin.xml
index 19880d6..c961e59 100644
--- a/log4j-distribution/src/assembly/bin.xml
+++ b/log4j-distribution/src/assembly/bin.xml
@@ -48,9 +48,9 @@ limitations under the License.
</fileSets>
<files>
<file>
- <source>../RELEASE-NOTES.txt</source>
+ <source>../RELEASE-NOTES.md</source>
<outputDirectory>.</outputDirectory>
- <destName>RELEASE-NOTES.txt</destName>
+ <destName>RELEASE-NOTES.md</destName>
</file>
</files>
</assembly>
[12/27] logging-log4j2 git commit: [maven-release-plugin] prepare for
next development iteration
Posted by mi...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/56a08d01
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/56a08d01
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/56a08d01
Branch: refs/heads/LOG4J2-1851
Commit: 56a08d0131a4574d10a2556fecbb60858c0ead0f
Parents: 097426a
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 15:05:16 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 15:05:16 2017 -0500
----------------------------------------------------------------------
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 +-
log4j-bom/pom.xml | 6 +-----
log4j-core-its/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
log4j-distribution/pom.xml | 2 +-
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 | 4 ++--
29 files changed, 30 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-1.2-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index ba0b1ed..6f9a987 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-1.2-api</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-api-scala_2.10/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index 93a1c8f..6eb78b9 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-scala_2.10</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-api-scala_2.11/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index d48a209..4044e85 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-scala_2.11</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 5d9da17..44b7e2f 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-bom/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 2149ed5..920f6a0 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -26,7 +26,7 @@
<description>Apache Log4j Bill of Materials</description>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
@@ -149,8 +149,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>log4j-2.8.2-rc1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-core-its/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 39a9431..d537498 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-its</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 9345ed7..61ee9e7 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 26e6101..8953a5e 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-flume-ng/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 8701c3f..f6fc9c9 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-flume-ng</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-iostreams/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 07dfabe..03ed026 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-iostreams</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-jcl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 882a0cd..2f615df 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jcl</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-jmx-gui/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index de6c300..792a398 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-jul/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 96664a4..8c562a9 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-liquibase/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 9036c3b..f1d6d92 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-liquibase</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-nosql/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-nosql/pom.xml b/log4j-nosql/pom.xml
index 84d96e5..ecdc9ba 100644
--- a/log4j-nosql/pom.xml
+++ b/log4j-nosql/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 8e76a74..d507292 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-perf/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 189b8a2..e4e764e 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/pom.xml b/log4j-samples/configuration/pom.xml
index 7e37479..048167f 100644
--- a/log4j-samples/configuration/pom.xml
+++ b/log4j-samples/configuration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-configuration</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/flume-common/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-common/pom.xml b/log4j-samples/flume-common/pom.xml
index 0d410f0..0441031 100644
--- a/log4j-samples/flume-common/pom.xml
+++ b/log4j-samples/flume-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-flume-common</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/flume-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-embedded/pom.xml b/log4j-samples/flume-embedded/pom.xml
index b46cbb9..a2f28c2 100644
--- a/log4j-samples/flume-embedded/pom.xml
+++ b/log4j-samples/flume-embedded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-flume-embedded</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/flume-remote/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-remote/pom.xml b/log4j-samples/flume-remote/pom.xml
index 6196e3d..e4b5731 100644
--- a/log4j-samples/flume-remote/pom.xml
+++ b/log4j-samples/flume-remote/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-flume-remote</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/loggerProperties/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/loggerProperties/pom.xml b/log4j-samples/loggerProperties/pom.xml
index 0b5e631..207bb2e 100644
--- a/log4j-samples/loggerProperties/pom.xml
+++ b/log4j-samples/loggerProperties/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-loggerProperties</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 3936d18..2c7cc63 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j.samples</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-samples/scala-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/scala-api/pom.xml b/log4j-samples/scala-api/pom.xml
index 0e0afc1..d305bcb 100644
--- a/log4j-samples/scala-api/pom.xml
+++ b/log4j-samples/scala-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<artifactId>log4j-samples-scala-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-slf4j-impl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 95b073f..bd84663 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-slf4j-impl</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 1f23f0d..b50f792 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-taglib</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-to-slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 1f0e077..ad28c3a 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-to-slf4j</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/log4j-web/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 40a85d2..56d90f8 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56a08d01/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dba02cd..7751f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>log4j</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
- <version>2.8.2</version>
+ <version>2.8.3-SNAPSHOT</version>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
@@ -165,7 +165,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary</url>
- <tag>log4j-2.8.2-rc1</tag>
+ <tag>log4j-${Log4jReleaseVersion}</tag>
</scm>
<properties>
<!-- make sure to update these for each release! -->
[14/27] logging-log4j2 git commit: Add logo for 2.8.2
Posted by mi...@apache.org.
Add logo for 2.8.2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7bf62008
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7bf62008
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7bf62008
Branch: refs/heads/LOG4J2-1851
Commit: 7bf620086f14593c2ed59cbc3d7802b480d84ae0
Parents: 3275426
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sun Apr 2 18:10:46 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Apr 2 18:10:58 2017 -0700
----------------------------------------------------------------------
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
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bf62008/src/site/resources/images/logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png
index 5823bbe..3c7a536 100644
Binary files a/src/site/resources/images/logo.png and b/src/site/resources/images/logo.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bf62008/src/site/resources/logo/logo-electric-blue-2-2.8.2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-electric-blue-2-2.8.2.png b/src/site/resources/logo/logo-electric-blue-2-2.8.2.png
new file mode 100644
index 0000000..3c7a536
Binary files /dev/null and b/src/site/resources/logo/logo-electric-blue-2-2.8.2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bf62008/src/site/resources/logo/logo-electric-blue-2-2.8.2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-electric-blue-2-2.8.2.xcf b/src/site/resources/logo/logo-electric-blue-2-2.8.2.xcf
new file mode 100644
index 0000000..5a4b09e
Binary files /dev/null and b/src/site/resources/logo/logo-electric-blue-2-2.8.2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bf62008/src/site/resources/logo/logo-electric-blue-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-electric-blue-2.xcf b/src/site/resources/logo/logo-electric-blue-2.xcf
new file mode 100644
index 0000000..b9adef5
Binary files /dev/null and b/src/site/resources/logo/logo-electric-blue-2.xcf differ
[07/27] logging-log4j2 git commit: Update release notes for 2.8.2
Posted by mi...@apache.org.
Update release notes for 2.8.2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c43e5836
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c43e5836
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c43e5836
Branch: refs/heads/LOG4J2-1851
Commit: c43e5836c59c64b4d57428658a37160725daf405
Parents: 6e9ce04
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 13:42:00 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 13:42:00 2017 -0500
----------------------------------------------------------------------
RELEASE-NOTES.md | 74 ++++++++++++++++++++++++--------------------
pom.xml | 10 +++---
src/changes/changes.xml | 2 +-
3 files changed, 47 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c43e5836/RELEASE-NOTES.md
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9cba843..2ffc4fe 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,6 @@
-# Apache Log4j 2.8.1 Release Notes
+# Apache Log4j 2.8.2 Release Notes
-The Apache Log4j 2 team is pleased to announce the Log4j 2.8.1 release!
+The Apache Log4j 2 team is pleased to announce the Log4j 2.8.2 release!
Apache Log4j is a well known framework for logging application behavior. Log4j 2 is an upgrade
to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and provides
@@ -26,49 +26,57 @@ or
logger.error((Marker) null, \u201cThis is the log message\u201d, throwable);
-The Log4j 2.8.1 API, as well as many core components, maintains binary compatibility with previous releases.
+The Log4j 2.8.2 API, as well as many core components, maintains binary compatibility with previous releases.
-## GA Release 2.8.1
+## GA Release 2.8.2
Changes in this version include:
### New Features
-* [LOG4J2-1823](https://issues.apache.org/jira/browse/LOG4J2-1823):
-Remove deprecation on MessageSupplier lambda functions in Logger API.
-* [LOG4J2-1807](https://issues.apache.org/jira/browse/LOG4J2-1807):
-[core] Add and implement LogEvent.toImmutable().
+* [LOG4J2-1863](https://issues.apache.org/jira/browse/LOG4J2-1863):
+Add support for filtering input in TcpSocketServer and UdpSocketServer.
+* [LOG4J2-1848](https://issues.apache.org/jira/browse/LOG4J2-1848):
+Add JSON encoding support to EncodingPatternConverter %encode{}.
+* [LOG4J2-1843](https://issues.apache.org/jira/browse/LOG4J2-1843):
+Add support for appending common suffix to each line of throwable stack trace. Thanks to Zilong Song.
+* [LOG4J2-1838](https://issues.apache.org/jira/browse/LOG4J2-1838):
+Add support for appending common suffix to each line of extended and root throwable stack trace. Thanks to Zilong Song.
### Fixed Bugs
-* [LOG4J2-1804](https://issues.apache.org/jira/browse/LOG4J2-1804):
-Allow %i in file pattern to be preceded with characters other than just '-'. Thanks to Pierrick Hymbert.
-* [LOG4J2-1816](https://issues.apache.org/jira/browse/LOG4J2-1816):
-Change minOccur to minOccurs in Log4j-config.xsd. Thanks to shubhankar1100.
-* [LOG4J2-1803](https://issues.apache.org/jira/browse/LOG4J2-1803):
-Fix Maven POM to ensure JMH generated classes in log4j-perf are included in benchmarks jar.
-* [LOG4J2-1800](https://issues.apache.org/jira/browse/LOG4J2-1800):
-Report errors when sending to Kafka when using syncSend=false. Thanks to Vincent Tieleman.
-* [LOG4J2-1805](https://issues.apache.org/jira/browse/LOG4J2-1805):
-Fixed rare race condition in FixedDateFormat, made FixedDateFormat::millisSinceMidnight method public.
-* [LOG4J2-1799](https://issues.apache.org/jira/browse/LOG4J2-1799):
-Fixed bug in PropertiesUtil::getCharsetProperty that caused UnsupportedCharsetException for ConsoleAppender. Thanks to Eduard Gizatullin.
-* [LOG4J2-1806](https://issues.apache.org/jira/browse/LOG4J2-1806):
-Fix Javadoc for DefaultRolloverStrategy::purgeAscending Thanks to challarao.
-* [LOG4J2-1818](https://issues.apache.org/jira/browse/LOG4J2-1818):
-Fix rollover to work when filePattern contains no directory components. Thanks to xkr47.
+* [LOG4J2-1861](https://issues.apache.org/jira/browse/LOG4J2-1861):
+Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance.
+* [LOG4J2-1862](https://issues.apache.org/jira/browse/LOG4J2-1862):
+Fix JavaDoc about @Order and OrderComparator ordering. Thanks to wangyuntao.
+* [LOG4J2-1849](https://issues.apache.org/jira/browse/LOG4J2-1849):
+Fixed daylight savings time issue with FixedDateFormat.
+* [LOG4J2-1850](https://issues.apache.org/jira/browse/LOG4J2-1850):
+Fix CassandraRule and unit tests on Windows. Thanks to Ludovic Hochet.
+* [LOG4J2-1840](https://issues.apache.org/jira/browse/LOG4J2-1840):
+Fix typo in %replace converter documentation. Thanks to Pradeep Balasundaram.
+* [LOG4J2-1846](https://issues.apache.org/jira/browse/LOG4J2-1846):
+Handle when LogEvent.getLoggerName() returns null in LoggerNameLevelRewritePolicy.
+* [LOG4J2-1845](https://issues.apache.org/jira/browse/LOG4J2-1845):
+Handle when LogEvent.getLoggerName() returns null in KafkaAppender.
+* [LOG4J2-1853](https://issues.apache.org/jira/browse/LOG4J2-1853):
+The default value of RandomAccessFileAppender.Builder append field is wrong. Thanks to wangyuntao.
+* [LOG4J2-1835](https://issues.apache.org/jira/browse/LOG4J2-1835):
+Fix documentation about the licensing for JeroMQ.
+* [LOG4J2-1836](https://issues.apache.org/jira/browse/LOG4J2-1836):
+Update the API version to 2.6.0.
+* [LOG4J2-1831](https://issues.apache.org/jira/browse/LOG4J2-1831):
+NullPointerException in HtmlLayout. Thanks to Edward Serebrinskiy.
+* [LOG4J2-1820](https://issues.apache.org/jira/browse/LOG4J2-1820):
+Log4j 2.8 can lose exceptions when a security manager is present. Thanks to Jason Tedor.
### Changes
-* [LOG4J2-1822](https://issues.apache.org/jira/browse/LOG4J2-1822):
-Update SLF4J to 1.7.24.
-* [LOG4J2-1812](https://issues.apache.org/jira/browse/LOG4J2-1812):
-Improved error message when log4j 2 configuration file not found.
-* [LOG4J2-1810](https://issues.apache.org/jira/browse/LOG4J2-1810):
-Update to use Logback 1.1.10 and then Logback 1.2 for tests.
-* [LOG4J2-1819](https://issues.apache.org/jira/browse/LOG4J2-1819):
-Update Jackson from 2.8.5 to 2.8.6.
+* [LOG4J2-1827](https://issues.apache.org/jira/browse/LOG4J2-1827):
+Move integration tests to their own module to speed up build.
+* [LOG4J2-1856](https://issues.apache.org/jira/browse/LOG4J2-1856):
+Update Jackson from 2.8.6 to 2.8.7.
---
-Apache Log4j 2.8.1 requires a minimum of Java 7 to build and run. Log4j 2.3 was the
+Apache Log4j 2.8.2 requires a minimum of Java 7 to build and run. Log4j 2.3 was the
last release that supported Java 6.
Basic compatibility with Log4j 1.x is provided through the log4j-1.2-api component, however it
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c43e5836/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f9ac5da..eeb9bed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,11 +170,11 @@
<properties>
<!-- make sure to update these for each release! -->
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.8.1</Log4jReleaseVersion>
- <Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>
- <Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>
- <!-- <Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
- <Log4jReleaseKey>FA1C814D</Log4jReleaseKey> -->
+ <Log4jReleaseVersion>2.8.2</Log4jReleaseVersion>
+ <!--<Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>-->
+ <!--<Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>-->
+ <Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
+ <Log4jReleaseKey>FA1C814D</Log4jReleaseKey>
<!-- note that any properties you want available in velocity templates must not use periods! -->
<slf4jVersion>1.7.24</slf4jVersion>
<logbackVersion>1.2.0</logbackVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c43e5836/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 48e3da4..9968986 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,7 +30,7 @@
- "update" - Change
- "remove" - Removed
-->
- <release version="2.8.2" date="2017-MM-DD" description="GA Release 2.8.2">
+ <release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance.
</action>
[17/27] logging-log4j2 git commit: Upadate Apache Active MQ from
5.14.1 to 5.14.2 for testing.
Posted by mi...@apache.org.
Upadate Apache Active MQ from 5.14.1 to 5.14.2 for testing.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/53ed3c29
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/53ed3c29
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/53ed3c29
Branch: refs/heads/LOG4J2-1851
Commit: 53ed3c292e923772ac539e3ee0068fe736259bd2
Parents: 1c99c7b
Author: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Authored: Fri Apr 7 16:46:01 2017 -0700
Committer: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Committed: Fri Apr 7 16:46:01 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/53ed3c29/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7751f51..4b6606e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>4.3.1</osgi.api.version>
- <activemq.version>5.14.1</activemq.version>
+ <activemq.version>5.14.2</activemq.version>
<!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
<minSeverity>info</minSeverity>
<jctoolsVersion>1.2.1</jctoolsVersion>
[18/27] logging-log4j2 git commit: Upadate Apache Active MQ from
5.14.2 to 5.14.3 for testing.
Posted by mi...@apache.org.
Upadate Apache Active MQ from 5.14.2 to 5.14.3 for testing.
Builds OK locally with 'mvn clean install' and Apache Maven 3.5.0
(ff8f5e7444045639af65f6095c62210b5713f426; 2017-04-03T12:39:06-07:00)
Maven home: C:\Java\apache-maven-3.5.0\bin\..
Java version: 1.7.0_80, vendor: Oracle Corporation
Java home: C:\Program Files\Java\jdk1.7.0_80\jre
Default locale: en_US, platform encoding: Cp1252
OS name: "windows 8.1", version: "6.3", arch: "amd64", family: "windows"
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b79701d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b79701d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b79701d
Branch: refs/heads/LOG4J2-1851
Commit: 8b79701d6657348a12b6ac00b74d9cb0f8239a1b
Parents: 53ed3c2
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Apr 7 17:25:19 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Apr 7 17:25:19 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b79701d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4b6606e..e96bd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>4.3.1</osgi.api.version>
- <activemq.version>5.14.2</activemq.version>
+ <activemq.version>5.14.3</activemq.version>
<!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
<minSeverity>info</minSeverity>
<jctoolsVersion>1.2.1</jctoolsVersion>
[09/27] logging-log4j2 git commit: Update dependency-management
version in docs
Posted by mi...@apache.org.
Update dependency-management version in docs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0a6da7eb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0a6da7eb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0a6da7eb
Branch: refs/heads/LOG4J2-1851
Commit: 0a6da7eb454b7a37c45d6fc78a3cf34398b4c962
Parents: 6de5fb0
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 14:03:18 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 14:03:18 2017 -0500
----------------------------------------------------------------------
src/site/markdown/maven-artifacts.md.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0a6da7eb/src/site/markdown/maven-artifacts.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/maven-artifacts.md.vm b/src/site/markdown/maven-artifacts.md.vm
index acfa377..7bab295 100644
--- a/src/site/markdown/maven-artifacts.md.vm
+++ b/src/site/markdown/maven-artifacts.md.vm
@@ -144,7 +144,7 @@ is required for dependency management functionality.
```
plugins {
- id 'io.spring.dependency-management' version '1.0.0.RC2'
+ id 'io.spring.dependency-management' version '1.0.1.RELEASE'
}
dependencyManagement {
[21/27] logging-log4j2 git commit: [LOG4J2-1869] Update Kafka client
from 0.10.1.1 to 0.10.2.0.
Posted by mi...@apache.org.
[LOG4J2-1869] Update Kafka client from 0.10.1.1 to 0.10.2.0.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/49e843f2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/49e843f2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/49e843f2
Branch: refs/heads/LOG4J2-1851
Commit: 49e843f2d916139fe3fc2ea8921e0dd8363dee96
Parents: ccc30dc
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Apr 9 16:27:56 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Apr 9 16:27:56 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49e843f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d90c6f..4fddc79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.10.1.1</version>
+ <version>0.10.2.0</version>
</dependency>
<dependency>
<groupId>org.zeromq</groupId>
[20/27] logging-log4j2 git commit: [LOG4J2-1868] Update ZeroMQ's
JeroMQ from 0.3.6 to 0.4.0. Local build OK
Posted by mi...@apache.org.
[LOG4J2-1868] Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0. Local build OK
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ccc30dc0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ccc30dc0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ccc30dc0
Branch: refs/heads/LOG4J2-1851
Commit: ccc30dc09d7dc0e7fe3db05dc7e5f7a086b8f21c
Parents: 90a8f79
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Apr 7 22:40:05 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Apr 7 22:40:05 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ccc30dc0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e1bbce..0d90c6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,7 +592,7 @@
<dependency>
<groupId>org.zeromq</groupId>
<artifactId>jeromq</artifactId>
- <version>0.3.6</version>
+ <version>0.4.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ccc30dc0/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9968986..88faf7b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,11 @@
- "update" - Change
- "remove" - Removed
-->
+ <release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1868" dev="ggregory" type="fix">
+ Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0.
+ </action>
+ </release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance.
[23/27] logging-log4j2 git commit: [LOG4J2-1872 Update JavaMail from
1.5.5 to 1.5.6.
Posted by mi...@apache.org.
[LOG4J2-1872 Update JavaMail from 1.5.5 to 1.5.6.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c4b4836f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c4b4836f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c4b4836f
Branch: refs/heads/LOG4J2-1851
Commit: c4b4836fb91b453aa4eb907b2821dca4057051cc
Parents: ef7f724
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Apr 9 20:20:08 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Apr 9 20:20:08 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4b4836f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4fddc79..ab5ac19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -571,7 +571,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4b4836f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8ad71e7..93890fe 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -37,6 +37,9 @@
<action issue="LOG4J2-1869" dev="ggregory" type="update">
Update Kafka client from 0.10.1.1 to 0.10.2.0
</action>
+ <action issue="LOG4J2-1872" dev="ggregory" type="update">
+ Update JavaMail from 1.5.5 to 1.5.6.
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[15/27] logging-log4j2 git commit: Mention development snapshots in
README
Posted by mi...@apache.org.
Mention development snapshots in README
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1c99c7b4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1c99c7b4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1c99c7b4
Branch: refs/heads/LOG4J2-1851
Commit: 1c99c7b4655e0ed74ac7fe5bf37536cbaa62497d
Parents: 7bf6200
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Apr 5 16:53:34 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Apr 5 16:53:34 2017 +0200
----------------------------------------------------------------------
README.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1c99c7b4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index bde127d..1e10207 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,8 @@ Apache Log4j 2 is distributed under the [Apache License, version 2.0](http://www
[How to download Log4j](http://logging.apache.org/log4j/2.x/download.html),
and [how to use it from Maven, Ivy and Gradle](http://logging.apache.org/log4j/2.x/maven-artifacts.html).
+You can access the latest development snapshot by using the Maven repository `https://repository.apache.org/snapshots`,
+see [Snapshot builds](https://logging.apache.org/log4j/2.x/maven-artifacts.html#Snapshot_builds).
## Issue Tracking
[13/27] logging-log4j2 git commit: Better Windows instructions.
Posted by mi...@apache.org.
Better Windows instructions.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/32754269
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/32754269
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/32754269
Branch: refs/heads/LOG4J2-1851
Commit: 32754269097dfe20918636b85c1221c4c4fa8e5b
Parents: 56a08d0
Author: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Authored: Sun Apr 2 15:33:11 2017 -0700
Committer: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Committed: Sun Apr 2 15:33:11 2017 -0700
----------------------------------------------------------------------
BUILDING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/32754269/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index 9fad590..f2b6d20 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -50,7 +50,7 @@ If Java 7 runs out of memory building the site, you will need:
On Windows, use a local staging directory, for example:
- mvn site:stage-deploy -DstagingSiteURL=file:///%HOME%/log4j
+ mvn site:stage-deploy -DstagingSiteURL=file:///%HOMEDRIVE%%HOMEPATH%/log4j
On UNIX, use a local staging directory, for example:
[02/27] logging-log4j2 git commit: [LOG4J2-1863] Add class filtering
to AbstractSocketServer
Posted by mi...@apache.org.
[LOG4J2-1863] Add class filtering to AbstractSocketServer
This allows a whitelist of class names to be specified to configure
which classes are allowed to be deserialized in both TcpSocketServer and
UdpSocketServer.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5dcc1921
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5dcc1921
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5dcc1921
Branch: refs/heads/LOG4J2-1851
Commit: 5dcc19215827db29c993d0305ee2b0d8dd05939d
Parents: 5aff929
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 11 16:01:46 2017 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 12:41:20 2017 -0500
----------------------------------------------------------------------
.../core/net/server/AbstractSocketServer.java | 13 ++++
.../server/ObjectInputStreamLogEventBridge.java | 23 ++++++-
.../log4j/core/net/server/TcpSocketServer.java | 25 +++++++-
.../log4j/core/net/server/UdpSocketServer.java | 18 +++++-
.../core/util/FilteredObjectInputStream.java | 67 ++++++++++++++++++++
5 files changed, 140 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dcc1921/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
index 9836694..923d3f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
@@ -26,6 +26,8 @@ import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.URI;
import java.net.URL;
+import java.util.Collections;
+import java.util.List;
import java.util.Objects;
import com.beust.jcommander.Parameter;
@@ -70,6 +72,9 @@ public abstract class AbstractSocketServer<T extends InputStream> extends LogEve
"-a" }, converter = InetAddressConverter.class, description = "Server socket local bind address.")
private InetAddress localBindAddress;
+ @Parameter(names = {"--classes", "-C"}, description = "Additional classes to allow deserialization")
+ private List<String> allowedClasses;
+
String getConfigLocation() {
return configLocation;
}
@@ -101,6 +106,14 @@ public abstract class AbstractSocketServer<T extends InputStream> extends LogEve
void setLocalBindAddress(final InetAddress localBindAddress) {
this.localBindAddress = localBindAddress;
}
+
+ List<String> getAllowedClasses() {
+ return allowedClasses == null ? Collections.<String>emptyList() : allowedClasses;
+ }
+
+ void setAllowedClasses(final List<String> allowedClasses) {
+ this.allowedClasses = allowedClasses;
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dcc1921/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java
index 059f069..a27b1cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/ObjectInputStreamLogEventBridge.java
@@ -19,18 +19,37 @@ package org.apache.logging.log4j.core.net.server;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
+import java.util.Collections;
+import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.core.util.FilteredObjectInputStream;
/**
* Reads and logs serialized {@link LogEvent} objects from an {@link ObjectInputStream}.
*/
public class ObjectInputStreamLogEventBridge extends AbstractLogEventBridge<ObjectInputStream> {
+ private final List<String> allowedClasses;
+
+ public ObjectInputStreamLogEventBridge() {
+ this(Collections.<String>emptyList());
+ }
+
+ /**
+ * Constructs an ObjectInputStreamLogEventBridge with additional allowed classes to deserialize.
+ *
+ * @param allowedClasses class names to also allow for deserialization
+ * @since 2.8.2
+ */
+ public ObjectInputStreamLogEventBridge(final List<String> allowedClasses) {
+ this.allowedClasses = allowedClasses;
+ }
+
@Override
public void logEvents(final ObjectInputStream inputStream, final LogEventListener logEventListener)
- throws IOException {
+ throws IOException {
try {
logEventListener.log((LogEvent) inputStream.readObject());
} catch (final ClassNotFoundException e) {
@@ -40,6 +59,6 @@ public class ObjectInputStreamLogEventBridge extends AbstractLogEventBridge<Obje
@Override
public ObjectInputStream wrapStream(final InputStream inputStream) throws IOException {
- return new ObjectInputStream(inputStream);
+ return new FilteredObjectInputStream(inputStream, allowedClasses);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dcc1921/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
index 68ac1ba..b5ce211 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
@@ -24,6 +24,8 @@ import java.io.OptionalDataException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -148,9 +150,26 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
*/
public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port, final int backlog,
final InetAddress localBindAddress) throws IOException {
+ return createSerializedSocketServer(port, backlog, localBindAddress, Collections.<String>emptyList());
+ }
+
+ /**
+ * Creates a socket server that reads serialized log events.
+ *
+ * @param port the port to listen
+ * @param localBindAddress The server socket's local bin address
+ * @param allowedClasses additional class names to allow for deserialization
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ * @since 2.8.2
+ */
+ public static TcpSocketServer<ObjectInputStream> createSerializedSocketServer(
+ final int port, final int backlog, final InetAddress localBindAddress, final List<String> allowedClasses
+ ) throws IOException {
LOGGER.entry(port);
final TcpSocketServer<ObjectInputStream> socketServer = new TcpSocketServer<>(port, backlog, localBindAddress,
- new ObjectInputStreamLogEventBridge());
+ new ObjectInputStreamLogEventBridge(allowedClasses));
return LOGGER.exit(socketServer);
}
@@ -185,8 +204,8 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
if (cla.getConfigLocation() != null) {
ConfigurationFactory.setConfigurationFactory(new ServerConfigurationFactory(cla.getConfigLocation()));
}
- final TcpSocketServer<ObjectInputStream> socketServer = TcpSocketServer
- .createSerializedSocketServer(cla.getPort(), cla.getBacklog(), cla.getLocalBindAddress());
+ final TcpSocketServer<ObjectInputStream> socketServer = TcpSocketServer.createSerializedSocketServer(
+ cla.getPort(), cla.getBacklog(), cla.getLocalBindAddress(), cla.getAllowedClasses());
final Thread serverThread = socketServer.startNewThread();
if (cla.isInteractive()) {
socketServer.awaitTermination(serverThread);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dcc1921/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
index ed04f69..e761c3b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
@@ -24,6 +24,7 @@ import java.io.ObjectInputStream;
import java.io.OptionalDataException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
+import java.util.List;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
@@ -64,6 +65,21 @@ public class UdpSocketServer<T extends InputStream> extends AbstractSocketServer
}
/**
+ * Creates a socket server that reads serialized log events.
+ *
+ * @param port the port to listen
+ * @param allowedClasses additional classes to allow for deserialization
+ * @return a new a socket server
+ * @throws IOException if an I/O error occurs when opening the socket.
+ * @since 2.8.2
+ */
+ public static UdpSocketServer<ObjectInputStream> createSerializedSocketServer(final int port,
+ final List<String> allowedClasses)
+ throws IOException {
+ return new UdpSocketServer<>(port, new ObjectInputStreamLogEventBridge(allowedClasses));
+ }
+
+ /**
* Creates a socket server that reads XML log events.
*
* @param port
@@ -93,7 +109,7 @@ public class UdpSocketServer<T extends InputStream> extends AbstractSocketServer
ConfigurationFactory.setConfigurationFactory(new ServerConfigurationFactory(cla.getConfigLocation()));
}
final UdpSocketServer<ObjectInputStream> socketServer = UdpSocketServer
- .createSerializedSocketServer(cla.getPort());
+ .createSerializedSocketServer(cla.getPort(), cla.getAllowedClasses());
final Thread serverThread = socketServer.startNewThread();
if (cla.isInteractive()) {
socketServer.awaitTermination(serverThread);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dcc1921/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.java
new file mode 100644
index 0000000..57cc31c
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Extended ObjectInputStream that only allows certain classes to be deserialized.
+ *
+ * @since 2.8.2
+ */
+public class FilteredObjectInputStream extends ObjectInputStream {
+
+ private static final List<String> REQUIRED_JAVA_CLASSES = Arrays.asList(
+ // for StandardLevel
+ "java.lang.Enum",
+ // for location information
+ "java.lang.StackTraceElement",
+ // for Message delegate
+ "java.rmi.MarshalledObject",
+ "[B"
+ );
+
+ private final Collection<String> allowedClasses;
+
+ public FilteredObjectInputStream(final InputStream in, final Collection<String> allowedClasses) throws IOException {
+ super(in);
+ this.allowedClasses = allowedClasses;
+ }
+
+ @Override
+ protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+ String name = desc.getName();
+ if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
+ throw new InvalidObjectException("Class is not allowed for deserialization: " + name);
+ }
+ return super.resolveClass(desc);
+ }
+
+ private static boolean isAllowedByDefault(final String name) {
+ return name.startsWith("org.apache.logging.log4j.") ||
+ name.startsWith("[Lorg.apache.logging.log4j.") ||
+ REQUIRED_JAVA_CLASSES.contains(name);
+ }
+
+}
[16/27] logging-log4j2 git commit: LOG4J2-1860 Shortcut to add
Property and KeyValuePair component in ConfigurationBuilder
Posted by mi...@apache.org.
LOG4J2-1860 Shortcut to add Property and KeyValuePair component in ConfigurationBuilder
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/df1b3e88
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/df1b3e88
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/df1b3e88
Branch: refs/heads/LOG4J2-1851
Commit: df1b3e8846246988d6119f65e7fcb3e5a9a3f1cb
Parents: 1c99c7b
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Apr 5 18:03:27 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Apr 5 18:03:27 2017 +0200
----------------------------------------------------------------------
.../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 ++++++++++++++++++
.../builder/ConfigurationAssemblerTest.java | 6 +++-
.../builder/ConfigurationBuilderTest.java | 16 +++++++++
.../builder/CustomConfigurationFactory.java | 11 +++++++
9 files changed, 174 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 8141c25..c88cb09 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -227,6 +227,21 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
<B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String pluginName, String value);
+ /**
+ * Returns a builder for creating Property:s
+ * @param name The name of the property.
+ * @param value The value of the component.
+ * @return A new PropertyComponentBuilder.
+ */
+ PropertyComponentBuilder newProperty(String name, String value);
+
+ /**
+ * Returns a builder for creating KeyValuePair:s
+ * @param key The name
+ * @param value The value
+ * @return A new KeyValuePairComponentBuilder.
+ */
+ KeyValuePairComponentBuilder newKeyValuePair(String key, String value);
/**
* Returns a builder for creating CustomLevels
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/KeyValuePairComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/KeyValuePairComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/KeyValuePairComponentBuilder.java
new file mode 100644
index 0000000..d836a94
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/KeyValuePairComponentBuilder.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder.api;
+
+/**
+ * Assembler for constructing KeyValuePair Components.
+ * @since 2.9
+ */
+public interface KeyValuePairComponentBuilder extends ComponentBuilder<KeyValuePairComponentBuilder> {
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/PropertyComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/PropertyComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/PropertyComponentBuilder.java
new file mode 100644
index 0000000..bbf3995
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/PropertyComponentBuilder.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder.api;
+
+/**
+ * Assembler for constructing Property Components.
+ * @since 2.9
+ */
+public interface PropertyComponentBuilder extends ComponentBuilder<PropertyComponentBuilder> {
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 183094d..29acea4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -41,8 +41,10 @@ import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.CustomLevelComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.KeyValuePairComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.PropertyComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptFileComponentBuilder;
@@ -410,6 +412,15 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultComponentBuilder<>(this, name, type, value);
}
+ @Override
+ public PropertyComponentBuilder newProperty(String name, String value) {
+ return new DefaultPropertyComponentBuilder(this, name, value);
+ }
+
+ @Override
+ public KeyValuePairComponentBuilder newKeyValuePair(String key, String value) {
+ return new DefaultKeyValuePairComponentBuilder(this, key, value);
+ }
@Override
public CustomLevelComponentBuilder newCustomLevel(final String name, final int level) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultKeyValuePairComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultKeyValuePairComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultKeyValuePairComponentBuilder.java
new file mode 100644
index 0000000..a21e010
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultKeyValuePairComponentBuilder.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder.impl;
+
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.builder.api.KeyValuePairComponentBuilder;
+
+/**
+ * @since 2.9
+ */
+class DefaultKeyValuePairComponentBuilder extends DefaultComponentAndConfigurationBuilder<KeyValuePairComponentBuilder>
+ implements KeyValuePairComponentBuilder {
+
+ public DefaultKeyValuePairComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String key, final String value) {
+ super(builder,"KeyValuePair");
+ addAttribute("key", key);
+ addAttribute("value", value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultPropertyComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultPropertyComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultPropertyComponentBuilder.java
new file mode 100644
index 0000000..cc81a53
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultPropertyComponentBuilder.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder.impl;
+
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.builder.api.PropertyComponentBuilder;
+
+/**
+ * @since 2.9
+ */
+class DefaultPropertyComponentBuilder extends DefaultComponentAndConfigurationBuilder<PropertyComponentBuilder>
+ implements PropertyComponentBuilder {
+
+ public DefaultPropertyComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String name, final String value) {
+ super(builder, name, "Property", value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index ccb2cc5..ec4f541 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.mom.kafka.KafkaAppender;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.Configurator;
@@ -40,6 +41,7 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
+import org.apache.logging.log4j.core.layout.GelfLayout;
import org.apache.logging.log4j.core.util.Constants;
import org.junit.Test;
@@ -87,7 +89,9 @@ public class ConfigurationAssemblerTest {
assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
final Map<String, Appender> appenders = config.getAppenders();
assertNotNull(appenders);
- assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1);
+ assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 2);
+ final KafkaAppender kafkaAppender = (KafkaAppender)appenders.get("Kafka");
+ final GelfLayout gelfLayout = (GelfLayout)kafkaAppender.getLayout();
final Map<String, LoggerConfig> loggers = config.getLoggers();
assertNotNull(loggers);
assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 431ac01..7ac91e5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -42,16 +42,26 @@ public class ConfigurationBuilderTest {
builder.add(builder.newScriptFile("target/test-classes/scripts/filter.groovy").addIsWatched(true));
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
+
final AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
appenderBuilder.add(builder.newLayout("PatternLayout").
addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
builder.add(appenderBuilder);
+
+ final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Kafka", "Kafka").addAttribute("topic", "my-topic");
+ appenderBuilder2.addComponent(builder.newProperty("bootstrap.servers", "localhost:9092"));
+ appenderBuilder2.add(builder.newLayout("GelfLayout").
+ addAttribute("host", "my-host").
+ addComponent(builder.newKeyValuePair("extraField", "extraValue")));
+ builder.add(appenderBuilder2);
+
builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG, true).
add(builder.newAppenderRef("Stdout")).
addAttribute("additivity", false));
builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+
builder.addProperty("MyKey", "MyValue");
builder.add(builder.newCustomLevel("Panic", 17));
builder.setPackages("foo,bar");
@@ -75,6 +85,12 @@ public class ConfigurationBuilderTest {
INDENT + INDENT + INDENT + "<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
INDENT + INDENT + INDENT + "<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + EOL +
INDENT + INDENT + "</CONSOLE>" + EOL +
+ INDENT + INDENT + "<Kafka name=\"Kafka\" topic=\"my-topic\">" + EOL +
+ INDENT + INDENT + INDENT + "<Property name=\"bootstrap.servers\">localhost:9092</Property>" + EOL +
+ INDENT + INDENT + INDENT + "<GelfLayout host=\"my-host\">" + EOL +
+ INDENT + INDENT + INDENT + INDENT + "<KeyValuePair key=\"extraField\" value=\"extraValue\"/>" + EOL +
+ INDENT + INDENT + INDENT + "</GelfLayout>" + EOL +
+ INDENT + INDENT + "</Kafka>" + EOL +
INDENT + "</Appenders>" + EOL +
INDENT + "<Loggers>" + EOL +
INDENT + INDENT + "<Logger name=\"org.apache.logging.log4j\" level=\"DEBUG\" includeLocation=\"true\" additivity=\"false\">" + EOL +
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1b3e88/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
index ab6bb88..847f79e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
@@ -43,17 +43,28 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
builder.add(builder.newScriptFile("target/test-classes/scripts/filter.groovy").addIsWatched(true));
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
+
final AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
appenderBuilder.add(builder.newLayout("PatternLayout").
addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
builder.add(appenderBuilder);
+
+ final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Kafka", "Kafka").addAttribute("topic", "my-topic");
+ appenderBuilder2.addComponent(builder.newProperty("bootstrap.servers", "localhost:9092"));
+ appenderBuilder2.add(builder.newLayout("GelfLayout").
+ addAttribute("host", "my-host").
+ addComponent(builder.newKeyValuePair("extraField", "extraValue")));
+ builder.add(appenderBuilder2);
+
builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG, true).
add(builder.newAppenderRef("Stdout")).
addAttribute("additivity", false));
builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+
builder.add(builder.newCustomLevel("Panic", 17));
+
return builder.build();
}
[05/27] logging-log4j2 git commit: Add changelog entries
Posted by mi...@apache.org.
Add changelog entries
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b788f7b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b788f7b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b788f7b
Branch: refs/heads/LOG4J2-1851
Commit: 4b788f7b75dbb89ac7f63660f4f9099f4dd2c225
Parents: 3bc94c0
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 12:59:14 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 12:59:14 2017 -0500
----------------------------------------------------------------------
src/changes/changes.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4b788f7b/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e03024d..48e3da4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,12 @@
- "remove" - Removed
-->
<release version="2.8.2" date="2017-MM-DD" description="GA Release 2.8.2">
+ <action issue="LOG4J2-1861" dev="mattsicker" type="fix">
+ Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance.
+ </action>
+ <action issue="LOG4J2-1862" dev="mattsicker" type="fix" due-to="wangyuntao">
+ Fix JavaDoc about @Order and OrderComparator ordering.
+ </action>
<action issue="LOG4J2-1849" dev="rpopma" type="fix">
Fixed daylight savings time issue with FixedDateFormat.
</action>
@@ -49,6 +55,9 @@
<action issue="LOG4J2-1853" dev="ggregory" type="fix" due-to="wangyuntao">
The default value of RandomAccessFileAppender.Builder append field is wrong.
</action>
+ <action issue="LOG4J2-1863" dev="mattsicker" type="add">
+ Add support for filtering input in TcpSocketServer and UdpSocketServer.
+ </action>
<action issue="LOG4J2-1848" dev="mattsicker" type="add">
Add JSON encoding support to EncodingPatternConverter %encode{}.
</action>
[06/27] logging-log4j2 git commit: This closes #52
Posted by mi...@apache.org.
This closes #52
This PR was merged a while back, but GitHub still has it open.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6e9ce046
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6e9ce046
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6e9ce046
Branch: refs/heads/LOG4J2-1851
Commit: 6e9ce0460febd3f256e8df6d6c76ec63c56815f7
Parents: 4b788f7
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 13:01:07 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 13:01:07 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[22/27] logging-log4j2 git commit: [LOG4J2-1869] Update Kafka client
from 0.10.1.1 to 0.10.2.0.
Posted by mi...@apache.org.
[LOG4J2-1869] Update Kafka client from 0.10.1.1 to 0.10.2.0.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ef7f7241
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ef7f7241
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ef7f7241
Branch: refs/heads/LOG4J2-1851
Commit: ef7f7241fb4aefe76143677773e5d284c31c4f0d
Parents: 49e843f
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Apr 9 20:19:24 2017 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Apr 9 20:19:24 2017 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ef7f7241/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 88faf7b..8ad71e7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,9 +31,12 @@
- "remove" - Removed
-->
<release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
- <action issue="LOG4J2-1868" dev="ggregory" type="fix">
+ <action issue="LOG4J2-1868" dev="ggregory" type="update">
Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0.
</action>
+ <action issue="LOG4J2-1869" dev="ggregory" type="update">
+ Update Kafka client from 0.10.1.1 to 0.10.2.0
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[08/27] logging-log4j2 git commit: Add jdk8 profile to disable doclint
Posted by mi...@apache.org.
Add jdk8 profile to disable doclint
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6de5fb0d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6de5fb0d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6de5fb0d
Branch: refs/heads/LOG4J2-1851
Commit: 6de5fb0deaf52a51920a60ecfd40569333371af2
Parents: c43e583
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 14:01:11 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 14:01:11 2017 -0500
----------------------------------------------------------------------
pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6de5fb0d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eeb9bed..96c8d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -829,7 +829,7 @@
<bottom><![CDATA[<p align="center">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
- <!--<additionalparam>-Xdoclint:none</additionalparam>-->
+ <additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</plugin>
<plugin>
@@ -1498,5 +1498,14 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>java8-doclint-disabled</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ </properties>
+ </profile>
</profiles>
</project>
[25/27] logging-log4j2 git commit: Update changelog
Posted by mi...@apache.org.
Update changelog
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1475bd98
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1475bd98
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1475bd98
Branch: refs/heads/LOG4J2-1851
Commit: 1475bd988d6ac826cfef59865392c47fff9c1862
Parents: f64ea4b
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Apr 10 10:48:23 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Apr 10 10:48:23 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1475bd98/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 93890fe..1c6a7f8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1860" dev="mikes" type="add">
+ Shortcut to add Property and KeyValuePair component in ConfigurationBuilder.
+ </action>
<action issue="LOG4J2-1868" dev="ggregory" type="update">
Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0.
</action>
[11/27] logging-log4j2 git commit: [maven-release-plugin] prepare
release log4j-2.8.2-rc1
Posted by mi...@apache.org.
[maven-release-plugin] prepare release log4j-2.8.2-rc1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/097426a2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/097426a2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/097426a2
Branch: refs/heads/LOG4J2-1851
Commit: 097426a2154a6079cddd897502b6fb3ce5d50338
Parents: 9003d0e
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Apr 2 15:05:00 2017 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Apr 2 15:05:00 2017 -0500
----------------------------------------------------------------------
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 +-
log4j-bom/pom.xml | 6 +++++-
log4j-core-its/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
log4j-distribution/pom.xml | 2 +-
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 | 4 ++--
29 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-1.2-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 967ed36..ba0b1ed 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-1.2-api</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-api-scala_2.10/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index 1dfb32b..93a1c8f 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-scala_2.10</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-api-scala_2.11/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index 6a47ce5..d48a209 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-scala_2.11</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index abf0d8a..5d9da17 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-bom/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index a7f7af9..2149ed5 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -26,7 +26,7 @@
<description>Apache Log4j Bill of Materials</description>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
@@ -149,4 +149,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>log4j-2.8.2-rc1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-core-its/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 203c4ef..39a9431 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-its</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index a761223..9345ed7 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 7341a2b..26e6101 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-flume-ng/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 21c7656..8701c3f 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-flume-ng</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-iostreams/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 9b67f88..07dfabe 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-iostreams</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-jcl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 5ae70c3..882a0cd 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jcl</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-jmx-gui/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index e94d029..de6c300 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-jul/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index a874813..96664a4 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-liquibase/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 72ca6c0..9036c3b 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-liquibase</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-nosql/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-nosql/pom.xml b/log4j-nosql/pom.xml
index 7d1b33e..84d96e5 100644
--- a/log4j-nosql/pom.xml
+++ b/log4j-nosql/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 6418683..8e76a74 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-perf/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 4b9d92b..189b8a2 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/pom.xml b/log4j-samples/configuration/pom.xml
index 87e34b5..7e37479 100644
--- a/log4j-samples/configuration/pom.xml
+++ b/log4j-samples/configuration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-configuration</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/flume-common/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-common/pom.xml b/log4j-samples/flume-common/pom.xml
index ee9a074..0d410f0 100644
--- a/log4j-samples/flume-common/pom.xml
+++ b/log4j-samples/flume-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-flume-common</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/flume-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-embedded/pom.xml b/log4j-samples/flume-embedded/pom.xml
index 86ecb5a..b46cbb9 100644
--- a/log4j-samples/flume-embedded/pom.xml
+++ b/log4j-samples/flume-embedded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-flume-embedded</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/flume-remote/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/flume-remote/pom.xml b/log4j-samples/flume-remote/pom.xml
index 95b116a..6196e3d 100644
--- a/log4j-samples/flume-remote/pom.xml
+++ b/log4j-samples/flume-remote/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-flume-remote</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/loggerProperties/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/loggerProperties/pom.xml b/log4j-samples/loggerProperties/pom.xml
index 3b53ae1..0b5e631 100644
--- a/log4j-samples/loggerProperties/pom.xml
+++ b/log4j-samples/loggerProperties/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-loggerProperties</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 82188ea..3936d18 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j.samples</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-samples/scala-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/scala-api/pom.xml b/log4j-samples/scala-api/pom.xml
index c746206..0e0afc1 100644
--- a/log4j-samples/scala-api/pom.xml
+++ b/log4j-samples/scala-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<artifactId>log4j-samples-scala-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-slf4j-impl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 10f95f4..95b073f 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-slf4j-impl</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index a3036ae..1f23f0d 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-taglib</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-to-slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 1e87e29..1f0e077 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-to-slf4j</artifactId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/log4j-web/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 6cc9fd2..40a85d2 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/097426a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 96c8d3e..dba02cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>log4j</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.2</version>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
@@ -165,7 +165,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary</url>
- <tag>log4j-${Log4jReleaseVersion}</tag>
+ <tag>log4j-2.8.2-rc1</tag>
</scm>
<properties>
<!-- make sure to update these for each release! -->