Update log4j2 to 2.24.0

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Sep 9, 2024 · 568eecd · 568eecd
1 parent 2289977
commit 568eecd
Show file tree

Hide file tree

Showing 24 changed files with 14 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -289,7 +289,8 @@ allprojects {
     }
     compile.options.compilerArgs << '-Xlint:auxiliaryclass'
     compile.options.compilerArgs << '-Xlint:cast'
-    compile.options.compilerArgs << '-Xlint:classfile'
+    // See please https://github.com/apache/logging-log4j2/issues/2144
+    compile.options.compilerArgs << '-Xlint:-classfile'
     compile.options.compilerArgs << '-Xlint:dep-ann'
     compile.options.compilerArgs << '-Xlint:divzero'
     compile.options.compilerArgs << '-Xlint:empty'

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -12,7 +12,7 @@ jackson_databind  = 2.17.2
 snakeyaml         = 2.1
 icu4j             = 75.1
 supercsv          = 2.4.0
-log4j             = 2.21.0
+log4j             = 2.24.0
 slf4j             = 1.7.36
 asm               = 9.7
 jettison          = 1.5.4

diff --git a/libs/core/licenses/log4j-api-2.21.0.jar.sha1 b/libs/core/licenses/log4j-api-2.21.0.jar.sha1
diff --git a/libs/core/licenses/log4j-api-2.24.0.jar.sha1 b/libs/core/licenses/log4j-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+c6d9bd0c95c9bb6c530f4800da9507b98f018654
diff --git a/plugins/crypto-kms/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/crypto-kms/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/crypto-kms/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/crypto-kms/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.21.0.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.24.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.24.0.jar.sha1
@@ -0,0 +1 @@
+111816bc5854e0a9523fc627e58659a0269c1c81
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.21.0.jar.sha1
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.24.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+e973f7ec75c5efde7153ece8bfa0237b3fa861e4
diff --git a/server/licenses/log4j-api-2.21.0.jar.sha1 b/server/licenses/log4j-api-2.21.0.jar.sha1
diff --git a/server/licenses/log4j-api-2.24.0.jar.sha1 b/server/licenses/log4j-api-2.24.0.jar.sha1
@@ -0,0 +1 @@
+c6d9bd0c95c9bb6c530f4800da9507b98f018654
diff --git a/server/licenses/log4j-core-2.21.0.jar.sha1 b/server/licenses/log4j-core-2.21.0.jar.sha1
diff --git a/server/licenses/log4j-core-2.24.0.jar.sha1 b/server/licenses/log4j-core-2.24.0.jar.sha1
@@ -0,0 +1 @@
+537543d3b84d78b4d7ad055c98f8af13e5e7f3a8
diff --git a/server/licenses/log4j-jul-2.21.0.jar.sha1 b/server/licenses/log4j-jul-2.21.0.jar.sha1
diff --git a/server/licenses/log4j-jul-2.24.0.jar.sha1 b/server/licenses/log4j-jul-2.24.0.jar.sha1
@@ -0,0 +1 @@
+8dfc879094c3e490c0a837f9a72fc6a12cf02856