Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update org.apache.logging.log4j:* to v2.21.0 (#2037)

Solr Botfbe2adb61724
diff --git a/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1
deleted file mode 100644
index ac95ee746ec..00000000000
--- a/solr/licenses/log4j-1.2-api-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-689151374756cb809cb029f2501015bdc7733179
diff --git a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1
new file mode 100644
index 00000000000..41761161aba
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1
@@ -0,0 +1 @@
+12bad3819a9570807f3c97315930699584c12152
diff --git a/solr/licenses/log4j-api-2.20.0.jar.sha1 b/solr/licenses/log4j-api-2.20.0.jar.sha1
deleted file mode 100644
index 390ef64b01e..00000000000
--- a/solr/licenses/log4j-api-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1fe6082e660daf07c689a89c94dc0f49c26b44bb
diff --git a/solr/licenses/log4j-api-2.21.0.jar.sha1 b/solr/licenses/log4j-api-2.21.0.jar.sha1
new file mode 100644
index 00000000000..6a05a4e5cb0
--- /dev/null
+++ b/solr/licenses/log4j-api-2.21.0.jar.sha1
@@ -0,0 +1 @@
+760192f2b69eacf4a4afc78e5a1d7a8de054fcbd
diff --git a/solr/licenses/log4j-core-2.20.0.jar.sha1 b/solr/licenses/log4j-core-2.20.0.jar.sha1
deleted file mode 100644
index 6272a4a0858..00000000000
--- a/solr/licenses/log4j-core-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eb2a9a47b1396e00b5eee1264296729a70565cc0
diff --git a/solr/licenses/log4j-core-2.21.0.jar.sha1 b/solr/licenses/log4j-core-2.21.0.jar.sha1
new file mode 100644
index 00000000000..0a2615fc478
--- /dev/null
+++ b/solr/licenses/log4j-core-2.21.0.jar.sha1
@@ -0,0 +1 @@
+122e1a9e0603cc9eae07b0846a6ff01f2454bc49
diff --git a/solr/licenses/log4j-jul-2.20.0.jar.sha1 b/solr/licenses/log4j-jul-2.20.0.jar.sha1
deleted file mode 100644
index 980c951a714..00000000000
--- a/solr/licenses/log4j-jul-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8170e6118eac1ab332046c179718a0f107f688e1
diff --git a/solr/licenses/log4j-jul-2.21.0.jar.sha1 b/solr/licenses/log4j-jul-2.21.0.jar.sha1
new file mode 100644
index 00000000000..89f7c940953
--- /dev/null
+++ b/solr/licenses/log4j-jul-2.21.0.jar.sha1
@@ -0,0 +1 @@
+f0da61113f4a47654677e6a98b1e13ca7de2483d
diff --git a/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1
deleted file mode 100644
index ba0ad6db32b..00000000000
--- a/solr/licenses/log4j-layout-template-json-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-16f2e5669f4e4173fc446007e8b85aa2313df33b
diff --git a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1
new file mode 100644
index 00000000000..f7ee63037a5
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1
@@ -0,0 +1 @@
+c90f410a98ddbbfe90b4ebe7f1e23526d72c0c96
diff --git a/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1
deleted file mode 100644
index 5c2144b9c61..00000000000
--- a/solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-155c8b9bbdac91d8461d9a403a646e6bd0d365d8
diff --git a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1
new file mode 100644
index 00000000000..f5d1f87d8f1
--- /dev/null
+++ b/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1
@@ -0,0 +1 @@
+070c38c479f4c495cab11da8396348eebffefcb2
diff --git a/solr/licenses/log4j-web-2.20.0.jar.sha1 b/solr/licenses/log4j-web-2.20.0.jar.sha1
deleted file mode 100644
index 586ef6986b9..00000000000
--- a/solr/licenses/log4j-web-2.20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3877f128ebc8655c4a48944ebf3e2c94de1bfbed
diff --git a/solr/licenses/log4j-web-2.21.0.jar.sha1 b/solr/licenses/log4j-web-2.21.0.jar.sha1
new file mode 100644
index 00000000000..f2ae414b1ed
--- /dev/null
+++ b/solr/licenses/log4j-web-2.21.0.jar.sha1
@@ -0,0 +1 @@
+5b6f3db6a2b00b033ec2c9ca8eabb08a00728df2
diff --git a/versions.lock b/versions.lock
index 7fd5d5bae8c..51da4afe409 100644
--- a/versions.lock
+++ b/versions.lock
@@ -200,13 +200,13 @@ org.apache.kerby:kerby-asn1:1.0.1 (1 constraints: fd0be9f4)
org.apache.kerby:kerby-config:1.0.1 (4 constraints: 4d3182b9)
org.apache.kerby:kerby-pkix:1.0.1 (1 constraints: 710bfce4)
org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)
-org.apache.logging.log4j:log4j-1.2-api:2.20.0 (1 constraints: 3605333b)
-org.apache.logging.log4j:log4j-api:2.20.0 (10 constraints: ea7d264d)
-org.apache.logging.log4j:log4j-core:2.20.0 (5 constraints: 5b51898f)
-org.apache.logging.log4j:log4j-jul:2.20.0 (1 constraints: 3605333b)
-org.apache.logging.log4j:log4j-layout-template-json:2.20.0 (1 constraints: 3605333b)
-org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0 (1 constraints: 3605333b)
-org.apache.logging.log4j:log4j-web:2.20.0 (1 constraints: 3605333b)
+org.apache.logging.log4j:log4j-1.2-api:2.21.0 (1 constraints: 3705363b)
+org.apache.logging.log4j:log4j-api:2.21.0 (10 constraints: f07d3453)
+org.apache.logging.log4j:log4j-core:2.21.0 (5 constraints: 5f510091)
+org.apache.logging.log4j:log4j-jul:2.21.0 (1 constraints: 3705363b)
+org.apache.logging.log4j:log4j-layout-template-json:2.21.0 (1 constraints: 3705363b)
+org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0 (1 constraints: 3705363b)
+org.apache.logging.log4j:log4j-web:2.21.0 (1 constraints: 3705363b)
org.apache.lucene:lucene-analysis-common:9.8.0 (10 constraints: fc9e4474)
org.apache.lucene:lucene-analysis-icu:9.8.0 (1 constraints: 13053036)
org.apache.lucene:lucene-analysis-kuromoji:9.8.0 (1 constraints: 13053036)
diff --git a/versions.props b/versions.props
index 9aca3f14187..7b653ecf519 100644
--- a/versions.props
+++ b/versions.props
@@ -46,7 +46,7 @@ org.apache.httpcomponents:httpclient=4.5.14
org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents:httpmime=4.5.14
org.apache.kerby:*=1.0.1
-org.apache.logging.log4j:*=2.20.0
+org.apache.logging.log4j:*=2.21.0
org.apache.lucene:*=9.8.0
org.apache.tika:*=1.28.5
org.apache.tomcat:annotations-api=6.0.53