Apache Solr open-source search software
SOLR-15609: Upgrade log4j to 2.14.1
Chris Hostetterad065fdbd5d1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 4b723e913e5..262f4dfe132 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -400,6 +400,8 @@ Improvements* SOLR-15599: Upgrade AWS SDK from v1 to v2 for S3 Repository (Houston Putman)+* SOLR-15609: Upgrade log4j to 2.14.1 (hossman)+Optimizations---------------------* SOLR-15433: Replace transient core cache LRU by Caffeine cache. (Bruno Roustant)diff --git a/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1deleted file mode 100644index 78679ce88d6..00000000000--- a/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d05a7928403d9a8b37d66dc85319c33e5dba17dddiff --git a/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1 b/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1new file mode 100644index 00000000000..ef0bdbd2869--- /dev/null+++ b/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1@@ -0,0 +1 @@+6bfcc76fa1a1a41295aff0042200aaa82d9ac286diff --git a/solr/licenses/log4j-api-2.13.2.jar.sha1 b/solr/licenses/log4j-api-2.13.2.jar.sha1deleted file mode 100644index a9826491245..00000000000--- a/solr/licenses/log4j-api-2.13.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-567ea514dedd8679c429c5b5b39b0d67b6464c3cdiff --git a/solr/licenses/log4j-api-2.14.1.jar.sha1 b/solr/licenses/log4j-api-2.14.1.jar.sha1new file mode 100644index 00000000000..650ed8c0ef9--- /dev/null+++ b/solr/licenses/log4j-api-2.14.1.jar.sha1@@ -0,0 +1 @@+cd8858fbbde69f46bce8db1152c18a43328aae78diff --git a/solr/licenses/log4j-core-2.13.2.jar.sha1 b/solr/licenses/log4j-core-2.13.2.jar.sha1deleted file mode 100644index ce26d9c45a8..00000000000--- a/solr/licenses/log4j-core-2.13.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8eb1fc1914eb2550bf3ddea26917c9a7cbb00593diff --git a/solr/licenses/log4j-core-2.14.1.jar.sha1 b/solr/licenses/log4j-core-2.14.1.jar.sha1new file mode 100644index 00000000000..692beb9b1a5--- /dev/null+++ b/solr/licenses/log4j-core-2.14.1.jar.sha1@@ -0,0 +1 @@+9141212b8507ab50a45525b545b39d224614528bdiff --git a/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1deleted file mode 100644index 58fa437840b..00000000000--- a/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-49df25f7a35dd7fbd8131fc5ab09665d18e3d4fediff --git a/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1new file mode 100644index 00000000000..4731cdbc3ff--- /dev/null+++ b/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1@@ -0,0 +1 @@+9a40554b8dab7ac9606089c87ae8a5ba914ec932diff --git a/solr/licenses/log4j-web-2.13.2.jar.sha1 b/solr/licenses/log4j-web-2.13.2.jar.sha1deleted file mode 100644index 5dad454a820..00000000000--- a/solr/licenses/log4j-web-2.13.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-fb0fd4f049e77ced8db9b7706d33681c73ecb7e4diff --git a/solr/licenses/log4j-web-2.14.1.jar.sha1 b/solr/licenses/log4j-web-2.14.1.jar.sha1new file mode 100644index 00000000000..a0aedbf6002--- /dev/null+++ b/solr/licenses/log4j-web-2.14.1.jar.sha1@@ -0,0 +1 @@+cab83afbb8f2efdc730035b86d6f7b170c3cc2e7diff --git a/versions.lock b/versions.lockindex f18e9331d5b..1328c77bca2 100644--- a/versions.lock+++ b/versions.lock@@ -129,9 +129,9 @@ org.apache.kerby:kerby-asn1:1.0.1 (2 constraints: 001155df)org.apache.kerby:kerby-config:1.0.1 (1 constraints: 860b05e6)org.apache.kerby:kerby-pkix:1.0.1 (2 constraints: 741065ca)org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)-org.apache.logging.log4j:log4j-api:2.13.2 (4 constraints: d033f2b0)-org.apache.logging.log4j:log4j-core:2.13.2 (2 constraints: 0d16b224)-org.apache.logging.log4j:log4j-slf4j-impl:2.13.2 (1 constraints: 3a053a3b)+org.apache.logging.log4j:log4j-api:2.14.1 (4 constraints: d033fab0)+org.apache.logging.log4j:log4j-core:2.14.1 (2 constraints: 0d16b624)+org.apache.logging.log4j:log4j-slf4j-impl:2.14.1 (1 constraints: 3a053c3b)org.apache.lucene:lucene-analysis-common:9.0.0-prerelease5 (10 constraints: 10cca63a)org.apache.lucene:lucene-analysis-icu:9.0.0-prerelease5 (1 constraints: 95093990)org.apache.lucene:lucene-analysis-kuromoji:9.0.0-prerelease5 (1 constraints: 95093990)@@ -315,7 +315,7 @@ org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 0405f135)org.apache.kerby:kerb-server:1.0.1 (1 constraints: 0405f135)org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: 0405f135)org.apache.kerby:kerby-kdc:1.0.1 (1 constraints: 0405f135)-org.apache.logging.log4j:log4j-1.2-api:2.13.2 (1 constraints: 3a053a3b)+org.apache.logging.log4j:log4j-1.2-api:2.14.1 (1 constraints: 3a053c3b)org.asciidoctor:asciidoctorj:1.6.2 (1 constraints: 0b050436)org.asciidoctor:asciidoctorj-api:1.6.2 (1 constraints: e30cfb0d)org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271)diff --git a/versions.props b/versions.propsindex 688feba340e..2ca666d4acb 100644--- a/versions.props+++ b/versions.props@@ -89,7 +89,7 @@ org.apache.httpcomponents:httpcore=4.4.13org.apache.httpcomponents:httpmime=4.5.10org.apache.james:apache-mime4j*=0.8.3org.apache.kerby:*=1.0.1-org.apache.logging.log4j:*=2.13.2+org.apache.logging.log4j:*=2.14.1org.apache.lucene:*=9.0.0-prerelease5org.apache.opennlp:opennlp-tools=1.9.1org.apache.pdfbox:*=2.0.17