Merge pull request #253 from splunk/release-1.11.5

Dependencies version changes
splunk · Jun 2, 2022 · eb3a9d0 · eb3a9d0
2 parents 9ba8da5 + db14a52
commit eb3a9d0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,24 @@
 # Splunk Logging for Java Changelog
 
+## Version 1.11.5
+
+### Critical Security Update
+* Bump Log4J version to latest 2.17.2 @see [CVE-2021-44832 Log4j<2.17.1](https://nvd.nist.gov/vuln/detail/CVE-2021-44832)
+* Bump Logback version to latest 1.2.11 @see [CVE-2021-42550 Logback<1.2.8](https://nvd.nist.gov/vuln/detail/CVE-2021-42550)
+### Minor Changes
+* Bump org.slf4j:slf4j-api version to latest [1.7.36](https://github.com/qos-ch/slf4j/releases/tag/v_1.7.36)
+* Bump com.squareup.okhttp3:okhttp to latest [4.9.3](https://square.github.io/okhttp/changelogs/changelog_4x/#version-493)
+* Bump com.google.code.gson:gson to latest [2.9.0](https://github.com/google/gson/releases/tag/gson-parent-2.9.0)
+
 ## Version 1.11.4
 
 ### Critical Security Update
-Update Logback to version 1.2.9 per CVE-2021-42550.
+* Update Logback to version 1.2.9 per CVE-2021-42550.
 
 ## Version 1.11.3
 
 ### Critical Security Update
-Upgrade Log4J again v2.17.0 related to CVE-2021-45046 & CVE-2021-44228
+* Upgrade Log4J again v2.17.0 related to CVE-2021-45046 & CVE-2021-44228
 
 ## Version 1.11.2
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Splunk Logging for Java
 
-#### Version 1.11.4
+#### Version 1.11.5
 
 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).
 
@@ -33,9 +33,9 @@ You'll need Java version 8 or higher, from [OpenJDK](https://openjdk.java.net) o
 #### Logging frameworks
 
 If you're using the Log4j 2, Simple Logging Facade for Java (SLF4J), or Logback logging frameworks in conjunction with Splunk logging for Java there are additional compatibility requirements. For more about logging framework requirements, see [Enable logging to HEC](https://dev.splunk.com/enterprise/docs/devtools/java/logging-java/howtouseloggingjava/enableloghttpjava/) and [Enable logging to TCP inputs](https://dev.splunk.com/enterprise/docs/devtools/java/logging-java/howtouseloggingjava/enablelogtcpjava). These frameworks require:
-* Log4j version 2.17.0
-* SLF4J version 1.7.30
-* Logback version 1.2.9
+* Log4j version 2.17.2
+* SLF4J version 1.7.36
+* Logback version 1.2.11
 
 ## Documentation and resources
 

diff --git a/pom.xml b/pom.xml
@@ -23,10 +23,12 @@
 
         <!-- CVE-2021-44228: https://nvd.nist.gov/vuln/detail/CVE-2021-44228 -->
         <!-- CVE-2021-45046: https://nvd.nist.gov/vuln/detail/CVE-2021-45046 -->
-        <log4j2.version>2.17.0</log4j2.version>
+        <!-- CVE-2021-45105 (Log4j<2.17.0): https://nvd.nist.gov/vuln/detail/CVE-2021-45105 -->
+        <!-- CVE-2021-44832 (Log4j<2.17.1): https://nvd.nist.gov/vuln/detail/CVE-2021-44832 -->
+        <log4j2.version>2.17.2</log4j2.version>
 
         <!-- CVE-2021-42550: https://nvd.nist.gov/vuln/detail/CVE-2021-42550 -->
-        <logback.version>1.2.9</logback.version>
+        <logback.version>1.2.11</logback.version>
     </properties>
     <profiles>
         <profile>
@@ -191,7 +193,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.36</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -243,7 +245,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
@@ -291,7 +293,9 @@
                         </goals>
                         <configuration>
                             <source>8</source>
-                            <additionalOptions>-Xdoclint:syntax</additionalOptions>
+                            <additionalOptions>
+                                <additionalOption>-Xdoclint:syntax</additionalOption>
+                            </additionalOptions>
                         </configuration>
                     </execution>
                 </executions>