bump Log4j dependency to 2.17.0 on 6.8 (#13545)

* Update build.gradle * Update license information Co-authored-by: Rob Bavey <[email protected]>
elastic · Dec 18, 2021 · aa688a0 · aa688a0
1 parent 5bd5f98
commit aa688a0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/NOTICE.TXT b/NOTICE.TXT
@@ -5729,7 +5729,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 ==========
-Notice for: org.apache.logging.log4j:log4j-api-2.15.0
+Notice for: org.apache.logging.log4j:log4j-api-2.17.0
 ----------
 
 source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=a241a12d0ecd1eb83c030f18eb34f169fcd71f02;hb=HEAD
@@ -5752,7 +5752,7 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
 ==========
-Notice for: org.apache.logging.log4j:log4j-core-2.15.0
+Notice for: org.apache.logging.log4j:log4j-core-2.17.0
 ----------
 
 source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=a241a12d0ecd1eb83c030f18eb34f169fcd71f02;hb=HEAD
@@ -5775,7 +5775,7 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
 ==========
-Notice for: org.apache.logging.log4j:log4j-slf4j-impl-2.15.0
+Notice for: org.apache.logging.log4j:log4j-slf4j-impl-2.17.0
 ----------
 
 source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=a241a12d0ecd1eb83c030f18eb34f169fcd71f02;hb=HEAD

diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
@@ -10,7 +10,7 @@ version = versionMap['logstash-core']
 String jrubyVersion = versionMap['jruby']['version']
 String jacksonVersion = versionMap['jackson']
 String jacksonDatabindVersion = versionMap['jackson-databind']
-String log4jVersion = '2.15.0'
+String log4jVersion = '2.17.0'
 
 repositories {
     mavenCentral()

diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv
@@ -114,9 +114,9 @@ dependency,dependencyUrl,licenseOverride
 "numerizer:0.1.1","https://github.com/jduff/numerizer/",MIT
 "openssl_pkcs8_pure:0.0.0.2",http://github.com/cielavenir/openssl_pkcs8_pure,Ruby
 "options",https://github.com/headius/options,Apache-2.0
-"org.apache.logging.log4j:log4j-api:2.15.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-core:2.15.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-slf4j-impl:2.15.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-api:2.17.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-core:2.17.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-slf4j-impl:2.17.0",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
 "org.codehaus.janino:commons-compiler:3.0.8",https://github.com/janino-compiler/janino,BSD-3-Clause
 "org.codehaus.janino:janino:3.0.8",https://github.com/janino-compiler/janino,BSD-3-Clause
 "org.codehaus.mojo:animal-sniffer-annotations:1.14",https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/,MIT

diff --git a/...logging.log4j!log4j-api-2.15.0-NOTICE.txt → ...logging.log4j!log4j-api-2.17.0-NOTICE.txt b/...logging.log4j!log4j-api-2.15.0-NOTICE.txt → ...logging.log4j!log4j-api-2.17.0-NOTICE.txt
diff --git a/...ogging.log4j!log4j-core-2.15.0-NOTICE.txt → ...ogging.log4j!log4j-core-2.17.0-NOTICE.txt b/...ogging.log4j!log4j-core-2.15.0-NOTICE.txt → ...ogging.log4j!log4j-core-2.17.0-NOTICE.txt
diff --git a/....log4j!log4j-slf4j-impl-2.15.0-NOTICE.txt → ....log4j!log4j-slf4j-impl-2.17.0-NOTICE.txt b/....log4j!log4j-slf4j-impl-2.15.0-NOTICE.txt → ....log4j!log4j-slf4j-impl-2.17.0-NOTICE.txt