diff --git a/changelog/unreleased/PR#4299-update-org-apache-logging-log4j-to-v2-25-4-branch.yml b/changelog/unreleased/PR#4299-update-org-apache-logging-log4j-to-v2-25-4-branch.yml new file mode 100644 index 000000000000..621e436dc843 --- /dev/null +++ b/changelog/unreleased/PR#4299-update-org-apache-logging-log4j-to-v2-25-4-branch.yml @@ -0,0 +1,7 @@ +title: Update org.apache.logging.log4j:* to v2.25.4 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4299 + url: https://github.com/apache/solr/pull/4299 diff --git a/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1 deleted file mode 100644 index 83aec31eda74..000000000000 --- a/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a7e550e638a5e534fd944616c5ae665a67e9501e diff --git a/solr/licenses/log4j-1.2-api-2.25.4.jar.sha1 b/solr/licenses/log4j-1.2-api-2.25.4.jar.sha1 new file mode 100644 index 000000000000..8128cd2c3a10 --- /dev/null +++ b/solr/licenses/log4j-1.2-api-2.25.4.jar.sha1 @@ -0,0 +1 @@ +351888743c1d0f7c9ec97a909ff2f7901f77df63 diff --git a/solr/licenses/log4j-api-2.25.3.jar.sha1 b/solr/licenses/log4j-api-2.25.3.jar.sha1 deleted file mode 100644 index 4c2f3c5d8ca6..000000000000 --- a/solr/licenses/log4j-api-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fb385330d89c2d61058ef649403f214633569205 diff --git a/solr/licenses/log4j-api-2.25.4.jar.sha1 b/solr/licenses/log4j-api-2.25.4.jar.sha1 new file mode 100644 index 000000000000..48ac0997c714 --- /dev/null +++ b/solr/licenses/log4j-api-2.25.4.jar.sha1 @@ -0,0 +1 @@ +89ff2217b193fb187b134aa6ebcbfa8a28b018a9 diff --git a/solr/licenses/log4j-core-2.25.3.jar.sha1 b/solr/licenses/log4j-core-2.25.3.jar.sha1 deleted file mode 100644 index be271a904a9e..000000000000 --- a/solr/licenses/log4j-core-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea diff --git a/solr/licenses/log4j-core-2.25.4.jar.sha1 b/solr/licenses/log4j-core-2.25.4.jar.sha1 new file mode 100644 index 000000000000..86d6d0a4223c --- /dev/null +++ b/solr/licenses/log4j-core-2.25.4.jar.sha1 @@ -0,0 +1 @@ +b963c3d6bfdf05c61ad47a74e9f9295131607df2 diff --git a/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1 deleted file mode 100644 index d71865ab1d33..000000000000 --- a/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -23ed918fa6e76480896db0e4d11cdda801ff2686 diff --git a/solr/licenses/log4j-layout-template-json-2.25.4.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.25.4.jar.sha1 new file mode 100644 index 000000000000..384da7b78289 --- /dev/null +++ b/solr/licenses/log4j-layout-template-json-2.25.4.jar.sha1 @@ -0,0 +1 @@ +abd87d615909a67e92b8ba6a4740fb2891533627 diff --git a/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 deleted file mode 100644 index 97e56ba12e57..000000000000 --- a/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8d1aca17817adb4a15720e64b98caf9cb3b2cc51 diff --git a/solr/licenses/log4j-slf4j2-impl-2.25.4.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.25.4.jar.sha1 new file mode 100644 index 000000000000..910afb39be5d --- /dev/null +++ b/solr/licenses/log4j-slf4j2-impl-2.25.4.jar.sha1 @@ -0,0 +1 @@ +052a8e43b29eee3b9d6cd9bad696f5d2284d7053 diff --git a/solr/licenses/log4j-web-2.25.3.jar.sha1 b/solr/licenses/log4j-web-2.25.3.jar.sha1 deleted file mode 100644 index 7c32788006de..000000000000 --- a/solr/licenses/log4j-web-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f3ccb822d3f38660089d750a520a00ec096ce1eb diff --git a/solr/licenses/log4j-web-2.25.4.jar.sha1 b/solr/licenses/log4j-web-2.25.4.jar.sha1 new file mode 100644 index 000000000000..1ccf0214d492 --- /dev/null +++ b/solr/licenses/log4j-web-2.25.4.jar.sha1 @@ -0,0 +1 @@ +abd60ce8488d4d7cf30fdc5cad3abf6d23eb6b1a diff --git a/versions.lock b/versions.lock index b99b5dd0c59d..3127a9e52b7b 100644 --- a/versions.lock +++ b/versions.lock @@ -217,12 +217,12 @@ org.apache.kerby:kerby-asn1:2.1.0 (1 constraints: fe0bf0f4) org.apache.kerby:kerby-config:2.1.0 (4 constraints: 51317aba) org.apache.kerby:kerby-pkix:2.1.0 (1 constraints: 720b03e5) org.apache.kerby:kerby-util:2.1.0 (2 constraints: 6718efb6) -org.apache.logging.log4j:log4j-1.2-api:2.25.3 (1 constraints: 3e05453b) -org.apache.logging.log4j:log4j-api:2.25.3 (7 constraints: 055675e1) -org.apache.logging.log4j:log4j-core:2.25.3 (5 constraints: 7b51299b) -org.apache.logging.log4j:log4j-layout-template-json:2.25.3 (1 constraints: 3e05453b) -org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3 (1 constraints: 3e05453b) -org.apache.logging.log4j:log4j-web:2.25.3 (1 constraints: 3e05453b) +org.apache.logging.log4j:log4j-1.2-api:2.25.4 (1 constraints: 3f05463b) +org.apache.logging.log4j:log4j-api:2.25.4 (7 constraints: 0a5686e4) +org.apache.logging.log4j:log4j-core:2.25.4 (5 constraints: 7f51989c) +org.apache.logging.log4j:log4j-layout-template-json:2.25.4 (1 constraints: 3f05463b) +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4 (1 constraints: 3f05463b) +org.apache.logging.log4j:log4j-web:2.25.4 (1 constraints: 3f05463b) org.apache.lucene:lucene-analysis-common:9.12.3 (10 constraints: c8a09441) org.apache.lucene:lucene-analysis-icu:9.12.3 (1 constraints: 4105623b) org.apache.lucene:lucene-analysis-kuromoji:9.12.3 (1 constraints: 4105623b) diff --git a/versions.props b/versions.props index b95645350ce2..e05398b42fed 100644 --- a/versions.props +++ b/versions.props @@ -56,7 +56,7 @@ org.apache.httpcomponents:httpcore=4.4.16 org.apache.httpcomponents:httpmime=4.5.14 org.apache.kafka:*=3.9.1 org.apache.kerby:*=2.1.0 -org.apache.logging.log4j:*=2.25.3 +org.apache.logging.log4j:*=2.25.4 org.apache.lucene:*=9.12.3 org.apache.poi:*=5.5.1 org.apache.tika:*=3.2.3