From 303a7f61d9db323fa8227d7634facfd41bded1ba Mon Sep 17 00:00:00 2001
From: Liying <ljiang@splunk.com>
Date: Thu, 11 Apr 2019 14:43:47 -0700
Subject: [PATCH 1/2] Dvpl 7500: upgrade log4j library to use 2.10.0 (#114)

* upgrade log4j to 2.10.0
---
 README.md                                         | 15 +++++++++++++++
 pom.xml                                           |  4 ++--
 .../logging/HttpEventCollectorLog4jAppender.java  |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d06cbf02..5502f339 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,21 @@ Splunk logging for Java provides:
 
 * Support for batching events (sent to HTTP Event Collector only).</li>
 
+### Requirements
+
+Here's what you need to get going with the Splunk SDK for Java.
+
+#### Splunk
+
+If you haven't already installed Splunk, download it
+[here](http://www.splunk.com/download). For more about installing and running
+Splunk and system requirements, see
+[Installing & Running Splunk](http://dev.splunk.com/view/SP-CAAADRV).
+
+#### Java 
+
+You'll need Java version 7 or higher, from [OpenJDK](https://openjdk.java.net) or [Oracle](https://www.oracle.com/technetwork/java).
+
 ## Documentation and resources
 
 * For more information about installing and using Splunk logging for Java, see
diff --git a/pom.xml b/pom.xml
index 80b67e57..4736d74f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,13 +208,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.1</version>
+            <version>2.10.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.1</version>
+            <version>2.10.0</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java b/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java
index 6465a46e..010b0f25 100644
--- a/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java
+++ b/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java
@@ -165,7 +165,7 @@ public static HttpEventCollectorLog4jAppender createAppender(
 
         if (layout == null)
         {
-            layout = PatternLayout.createLayout("%m", null, null, Charset.forName("UTF-8"), true, false, null, null);
+            layout = PatternLayout.createLayout("%m", null, null, null, Charset.forName("UTF-8"), true, false, null, null);
         }
 
         final boolean ignoreExceptionsBool = Boolean.getBoolean(ignoreExceptions);

From d761308db465e6ac3f1b482900e219cace260301 Mon Sep 17 00:00:00 2001
From: Liying Jiang <ljiang@splunk.com>
Date: Thu, 11 Apr 2019 15:25:41 -0700
Subject: [PATCH 2/2] Update version to 1.7.3

---
 CHANGELOG.md | 4 ++++
 README.md    | 2 +-
 pom.xml      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2071f3cb..349fc689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Splunk Logging for Java Changelog
 
+## Version 1.7.3
+
+* Update Log4j dependency version to 2.10.0 [#114](https://github.com/splunk/splunk-library-javalogging/pull/114).
+
 ## Version 1.7.2
 
 * Closing httpclient properly on logback shutdown [#112](https://github.com/splunk/splunk-library-javalogging/pull/112).
diff --git a/README.md b/README.md
index 5502f339..f511c269 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Splunk Logging for Java
 
-#### Version 1.7.2
+#### Version 1.7.3
 
 Splunk logging for Java enables you to log events to HTTP Event Collector or to a TCP input on a Splunk Enterprise instance within your Java applications. You can use three major Java logging frameworks: [Logback](http://logback.qos.ch), [Log4j 2](http://logging.apache.org/log4j/2.x/), and [java.util.logging](https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html). Splunk logging for Java is also enabled for [Simple Logging Facade for Java (SLF4J)](http://www.slf4j.org).
 
diff --git a/pom.xml b/pom.xml
index 4736d74f..a7da2093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.splunk.logging</groupId>
     <artifactId>splunk-library-javalogging</artifactId>
-    <version>1.7.2</version>
+    <version>1.7.3</version>
     <packaging>jar</packaging>
 
     <name>Splunk Logging for Java</name>