upgrade-log4j2-2.24.2

gradle/libs.versions.toml

@@ -39,7 +39,7 @@ apache-httpcomponents-httpcore = "4.4.16"
 apache-httpcomponents-httpmime = "4.5.14"
 apache-kafka = "3.7.1"
 apache-kerby = "2.0.3"
-apache-log4j = "2.21.0"
+apache-log4j = "2.24.2"
 apache-lucene = "9.11.1"
 apache-opennlp = "1.9.4"
 apache-poi = "5.2.2"
@@ -170,7 +170,7 @@ prometheus-metrics = "1.1.0"
 prometheus-simpleclient = "0.16.0"
 quicktheories = "0.26"
 semver4j = "5.3.0"
-slf4j = "2.0.13"
+slf4j = "2.0.16"
 spatial4j = "0.8"
 spotbugs = "4.8.6"
 squareup-okhttp3-mockwebserver = "4.11.0"

solr/core/build.gradle

@@ -174,6 +174,7 @@ dependencies {
   implementation libs.fasterxml.woodstox.core
   // See https://issues.apache.org/jira/browse/LOG4J2-3609 due to needing these annotations
   compileOnly libs.aqute.bnd.annotation
+  testCompileOnly libs.aqute.bnd.annotation
   compileOnly libs.osgi.annotation
 
   compileOnly libs.stephenc.jcip.annotations

solr/licenses/jcl-over-slf4j-2.0.16.jar.sha1

@@ -0,0 +1 @@
+9d08badad22f1ac07deac9188ade596472a2bfd9

solr/licenses/jul-to-slf4j-2.0.16.jar.sha1

@@ -0,0 +1 @@
+6d57da3e961daac65bcca0dd3def6cd11e48a24a

solr/licenses/log4j-1.2-api-2.24.2.jar.sha1

@@ -0,0 +1 @@
+2f98b6b7bdeec65e0bd161e66532736d94fd978e

solr/licenses/log4j-api-2.24.2.jar.sha1

@@ -0,0 +1 @@
+daf49ee71f2664c3ff57412e4b43061e61a28596

solr/licenses/log4j-core-2.24.2.jar.sha1

@@ -0,0 +1 @@
+9ba3a51ed9d80254b382dea521467de51797ac04

solr/licenses/log4j-layout-template-json-2.24.2.jar.sha1

@@ -0,0 +1 @@
+86fc08c972d1c5bb4f5317914797eb2d762e99f2

solr/licenses/log4j-slf4j2-impl-2.24.2.jar.sha1

@@ -0,0 +1 @@
+d118f26d5bfa91f4ba64f4f8d37e2b2fbe620ad0

solr/licenses/log4j-web-2.24.2.jar.sha1

@@ -0,0 +1 @@
+3926005dde36eb7e225243c9f66452f67376ff3c

solr/licenses/slf4j-api-2.0.16.jar.sha1

@@ -0,0 +1 @@
+0172931663a09a1fa515567af5fbef00897d3c04

solr/test-framework/build.gradle

@@ -24,6 +24,7 @@ dependencies {
   // annotation usage like in Zookeeper during compilation time.
   // It is not included in the release so exclude from checks.
   compileOnly libs.spotbugs.annotations
+  testCompileOnly libs.spotbugs.annotations
   permitUnusedDeclared libs.spotbugs.annotations
   // Exclude these from jar validation and license checks.
   configurations.jarValidation {
@@ -64,6 +65,11 @@ dependencies {
   implementation libs.slf4j.api
   implementation libs.apache.log4j.api
   implementation libs.apache.log4j.core
+  // See https://issues.apache.org/jira/browse/LOG4J2-3609 due to needing these annotations
+  compileOnly libs.aqute.bnd.annotation
+  testCompileOnly libs.aqute.bnd.annotation
+  compileOnly libs.osgi.annotation
+
   implementation libs.dropwizard.metrics.core
   implementation libs.dropwizard.metrics.jetty10
   implementation libs.commonscli.commonscli

versions.lock

@@ -2,7 +2,7 @@
   "comment" : "An inventory of resolved dependency versions. Do not edit this file directly.",
   "configurationGroups" : {
     "consolidated_dependencies" : {
-      "biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1" : "5fc760f2,refs=1",
+      "biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1" : "d42b985d,refs=4",
       "com.adobe.testing:s3mock:2.17.0" : "1e12e466,refs=2",
       "com.adobe.testing:s3mock-junit4:2.17.0" : "1e12e466,refs=2",
       "com.adobe.testing:s3mock-testsupport-common:2.17.0" : "1e12e466,refs=2",
@@ -37,7 +37,7 @@
       "com.github.kevinstern:software-and-algorithms:1.0" : "e5b524d7,refs=26",
       "com.github.luben:zstd-jni:1.5.6-3" : "f493e7bb,refs=7",
       "com.github.openjson:openjson:1.0.12" : "50a667d1,refs=5",
-      "com.github.spotbugs:spotbugs-annotations:4.8.6" : "761c3c3c,refs=5",
+      "com.github.spotbugs:spotbugs-annotations:4.8.6" : "65718105,refs=6",
       "com.github.stephenc.jcip:jcip-annotations:1.0-1" : "e9990913,refs=4",
       "com.github.virtuald:curvesapi:1.07" : "50a667d1,refs=5",
       "com.google.android:annotations:4.1.1.4" : "dd724fae,refs=6",
@@ -283,12 +283,12 @@
       "org.apache.kerby:kerby-config:2.0.3" : "1643ad05,refs=4",
       "org.apache.kerby:kerby-pkix:2.0.3" : "1643ad05,refs=4",
       "org.apache.kerby:kerby-util:2.0.3" : "1643ad05,refs=4",
-      "org.apache.logging.log4j:log4j-1.2-api:2.21.0" : "1640bbba,refs=20",
-      "org.apache.logging.log4j:log4j-api:2.21.0" : "bc8e8214,refs=87",
-      "org.apache.logging.log4j:log4j-core:2.21.0" : "72c9c512,refs=85",
-      "org.apache.logging.log4j:log4j-layout-template-json:2.21.0" : "6351de37,refs=19",
-      "org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0" : "08ef8dc6,refs=81",
-      "org.apache.logging.log4j:log4j-web:2.21.0" : "6351de37,refs=19",
+      "org.apache.logging.log4j:log4j-1.2-api:2.24.2" : "1640bbba,refs=20",
+      "org.apache.logging.log4j:log4j-api:2.24.2" : "bc8e8214,refs=87",
+      "org.apache.logging.log4j:log4j-core:2.24.2" : "72c9c512,refs=85",
+      "org.apache.logging.log4j:log4j-layout-template-json:2.24.2" : "6351de37,refs=19",
+      "org.apache.logging.log4j:log4j-slf4j2-impl:2.24.2" : "08ef8dc6,refs=81",
+      "org.apache.logging.log4j:log4j-web:2.24.2" : "6351de37,refs=19",
       "org.apache.lucene:lucene-analysis-common:9.11.1" : "17e13daa,refs=119",
       "org.apache.lucene:lucene-analysis-icu:9.11.1" : "b4755bf3,refs=9",
       "org.apache.lucene:lucene-analysis-kuromoji:9.11.1" : "ebd3db47,refs=77",
@@ -432,9 +432,9 @@
       "org.openjdk.jmh:jmh-core:1.37" : "c718e885,refs=5",
       "org.openjdk.jmh:jmh-generator-annprocess:1.37" : "2d06957b,refs=1",
       "org.opentest4j:opentest4j:1.2.0" : "3c9a199e,refs=29",
-      "org.osgi:org.osgi.resource:1.0.0" : "5fc760f2,refs=1",
-      "org.osgi:org.osgi.service.serviceloader:1.0.0" : "5fc760f2,refs=1",
-      "org.osgi:osgi.annotation:8.1.0" : "5fc760f2,refs=1",
+      "org.osgi:org.osgi.resource:1.0.0" : "d42b985d,refs=4",
+      "org.osgi:org.osgi.service.serviceloader:1.0.0" : "d42b985d,refs=4",
+      "org.osgi:osgi.annotation:8.1.0" : "43becb85,refs=2",
       "org.ow2.asm:asm:9.3" : "ddc123c8,refs=80",
       "org.ow2.asm:asm-analysis:7.2" : "ebd3db47,refs=77",
       "org.ow2.asm:asm-commons:7.2" : "ebd3db47,refs=77",
@@ -448,9 +448,9 @@
       "org.scala-lang:scala-library:2.13.15" : "4bf37e93,refs=3",
       "org.scala-lang:scala-reflect:2.13.12" : "4bf37e93,refs=3",
       "org.semver4j:semver4j:5.3.0" : "b57e9bf6,refs=85",
-      "org.slf4j:jcl-over-slf4j:2.0.13" : "a6fb6a35,refs=86",
-      "org.slf4j:jul-to-slf4j:2.0.13" : "58171492,refs=26",
-      "org.slf4j:slf4j-api:2.0.13" : "5fb053e8,refs=132",
+      "org.slf4j:jcl-over-slf4j:2.0.16" : "a6fb6a35,refs=86",
+      "org.slf4j:jul-to-slf4j:2.0.16" : "58171492,refs=26",
+      "org.slf4j:slf4j-api:2.0.16" : "5fb053e8,refs=132",
       "org.springframework.boot:spring-boot:2.7.13" : "1e12e466,refs=2",
       "org.springframework.boot:spring-boot-actuator:2.7.13" : "1e12e466,refs=2",
       "org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.13" : "1e12e466,refs=2",
@@ -5482,6 +5482,16 @@
         "projectPath" : ":solr:modules:sql"
       }
     ],
+    "43becb85" : [
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:core"
+      },
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:test-framework"
+      }
+    ],
     "4985a322" : [
       {
         "configuration" : "testRuntimeClasspath",
@@ -8186,12 +8196,6 @@
         "projectPath" : ":solr:modules:sql"
       }
     ],
-    "5fc760f2" : [
-      {
-        "configuration" : "compileClasspath",
-        "projectPath" : ":solr:core"
-      }
-    ],
     "5fcc0587" : [
       {
         "configuration" : "runtimeClasspath",
@@ -8284,6 +8288,32 @@
         "projectPath" : ":solr:modules:sql"
       }
     ],
+    "65718105" : [
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:core"
+      },
+      {
+        "configuration" : "testCompileClasspath",
+        "projectPath" : ":solr:core"
+      },
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:solrj-zookeeper"
+      },
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:test-framework"
+      },
+      {
+        "configuration" : "testCompileClasspath",
+        "projectPath" : ":solr:test-framework"
+      },
+      {
+        "configuration" : "testCompileClasspath",
+        "projectPath" : ":solr:modules:hadoop-auth"
+      }
+    ],
     "69bf1b73" : [
       {
         "configuration" : "compileClasspath",
@@ -10390,28 +10420,6 @@
         "projectPath" : ":solr:modules:sql"
       }
     ],
-    "761c3c3c" : [
-      {
-        "configuration" : "compileClasspath",
-        "projectPath" : ":solr:core"
-      },
-      {
-        "configuration" : "testCompileClasspath",
-        "projectPath" : ":solr:core"
-      },
-      {
-        "configuration" : "compileClasspath",
-        "projectPath" : ":solr:solrj-zookeeper"
-      },
-      {
-        "configuration" : "compileClasspath",
-        "projectPath" : ":solr:test-framework"
-      },
-      {
-        "configuration" : "testCompileClasspath",
-        "projectPath" : ":solr:modules:hadoop-auth"
-      }
-    ],
     "76db8e26" : [
       {
         "configuration" : "compileClasspath",
@@ -16672,6 +16680,24 @@
         "projectPath" : ":solr:modules:sql"
       }
     ],
+    "d42b985d" : [
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:core"
+      },
+      {
+        "configuration" : "testCompileClasspath",
+        "projectPath" : ":solr:core"
+      },
+      {
+        "configuration" : "compileClasspath",
+        "projectPath" : ":solr:test-framework"
+      },
+      {
+        "configuration" : "testCompileClasspath",
+        "projectPath" : ":solr:test-framework"
+      }
+    ],
     "dc28f153" : [
       {
         "configuration" : "testRuntimeClasspath",