This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 1217f48 SOLR-15871: Upgrade to Log4j 2.17.1 (#489)
1217f48 is described below
commit 1217f486f191137aace2971c8c69a90214a0cea0
Author: Jan Høydahl <[email protected]>
AuthorDate: Mon Jan 3 14:07:12 2022 +0100
SOLR-15871: Upgrade to Log4j 2.17.1 (#489)
---
solr/CHANGES.txt | 4 ++--
solr/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 +
solr/licenses/log4j-api-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.17.1.jar.sha1 | 1 +
solr/licenses/log4j-core-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.17.1.jar.sha1 | 1 +
solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-layout-template-json-2.17.1.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 | 1 +
solr/licenses/log4j-web-2.17.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.17.1.jar.sha1 | 1 +
versions.lock | 8 ++++----
versions.props | 2 +-
15 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d38c984..83fca04 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -452,13 +452,13 @@ Bug Fixes
* SOLR-14781: Removed many unused classes that accumulated over the years.
(Bence Szabo, David Smiley)
-* SOLR-15871: Update Log4J to 2.17 (weidongkl via janhoy)
+* SOLR-15871: Update Log4J to 2.17.1 (weidongkl via janhoy)
================== 8.11.2 ==================
Bug Fixes
---------------------
-* SOLR-15871: Update Log4J to 2.17 (weidongkl via janhoy)
+* SOLR-15871: Update Log4J to 2.17.1 (weidongkl via janhoy)
================== 8.11.1 ==================
diff --git a/solr/licenses/log4j-1.2-api-2.17.0.jar.sha1
b/solr/licenses/log4j-1.2-api-2.17.0.jar.sha1
deleted file mode 100644
index 5dddc7e..0000000
--- a/solr/licenses/log4j-1.2-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aaf998968370edf738322fb750fbda118055508b
diff --git a/solr/licenses/log4j-1.2-api-2.17.1.jar.sha1
b/solr/licenses/log4j-1.2-api-2.17.1.jar.sha1
new file mode 100644
index 0000000..99b2488
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+db3a7e7f07e878b92ac4a8f1100bee8325d5713a
diff --git a/solr/licenses/log4j-api-2.17.0.jar.sha1
b/solr/licenses/log4j-api-2.17.0.jar.sha1
deleted file mode 100644
index 17f60e4..0000000
--- a/solr/licenses/log4j-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbd791e9c8c9421e45337c4fe0a10851c086e36c
diff --git a/solr/licenses/log4j-api-2.17.1.jar.sha1
b/solr/licenses/log4j-api-2.17.1.jar.sha1
new file mode 100644
index 0000000..acdf9dd
--- /dev/null
+++ b/solr/licenses/log4j-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+d771af8e336e372fb5399c99edabe0919aeaf5b2
diff --git a/solr/licenses/log4j-core-2.17.0.jar.sha1
b/solr/licenses/log4j-core-2.17.0.jar.sha1
deleted file mode 100644
index 4ca8459..0000000
--- a/solr/licenses/log4j-core-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe6e7a32c1228884b9691a744f953a55d0dd8ead
diff --git a/solr/licenses/log4j-core-2.17.1.jar.sha1
b/solr/licenses/log4j-core-2.17.1.jar.sha1
new file mode 100644
index 0000000..aa16b80
--- /dev/null
+++ b/solr/licenses/log4j-core-2.17.1.jar.sha1
@@ -0,0 +1 @@
+779f60f3844dadc3ef597976fcb1e5127b1f343d
diff --git a/solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1
b/solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1
deleted file mode 100644
index 4d4e5ec..0000000
--- a/solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-829615bbe0c4760f6895308a3730df9a9ba16831
diff --git a/solr/licenses/log4j-layout-template-json-2.17.1.jar.sha1
b/solr/licenses/log4j-layout-template-json-2.17.1.jar.sha1
new file mode 100644
index 0000000..10052b3
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.17.1.jar.sha1
@@ -0,0 +1 @@
+fb9cdcd21b45a6da4eead9f6333e220f36ef2066
diff --git a/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
b/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
deleted file mode 100644
index 9bf6939..0000000
--- a/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ec25ce0254749c94549ea9c3cea34bd0488c9c6
diff --git a/solr/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
b/solr/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
new file mode 100644
index 0000000..b29c261
--- /dev/null
+++ b/solr/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
@@ -0,0 +1 @@
+84692d456bcce689355d33d68167875e486954dd
diff --git a/solr/licenses/log4j-web-2.17.0.jar.sha1
b/solr/licenses/log4j-web-2.17.0.jar.sha1
deleted file mode 100644
index 56bbe35..0000000
--- a/solr/licenses/log4j-web-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f668a2563a36bd5d07dcf2af21dd7220e43dcda6
diff --git a/solr/licenses/log4j-web-2.17.1.jar.sha1
b/solr/licenses/log4j-web-2.17.1.jar.sha1
new file mode 100644
index 0000000..eefd0a0
--- /dev/null
+++ b/solr/licenses/log4j-web-2.17.1.jar.sha1
@@ -0,0 +1 @@
+1a9e4a6ba9ac4e82c9d57ba7425168555b636d4f
diff --git a/versions.lock b/versions.lock
index a04c2cf..d401269 100644
--- a/versions.lock
+++ b/versions.lock
@@ -127,9 +127,9 @@ 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-api:2.17.0 (4 constraints: d83360b3)
-org.apache.logging.log4j:log4j-core:2.17.0 (2 constraints: 11162c25)
-org.apache.logging.log4j:log4j-slf4j-impl:2.17.0 (1 constraints: 3c05443b)
+org.apache.logging.log4j:log4j-api:2.17.1 (4 constraints: dc3387b4)
+org.apache.logging.log4j:log4j-core:2.17.1 (2 constraints: 13166125)
+org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 (1 constraints: 3d05453b)
org.apache.lucene:lucene-analysis-common:9.0.0 (10 constraints: ac9e842f)
org.apache.lucene:lucene-analysis-icu:9.0.0 (1 constraints: 0b051836)
org.apache.lucene:lucene-analysis-kuromoji:9.0.0 (1 constraints: 0b051836)
@@ -317,7 +317,7 @@ org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)
org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
-org.apache.logging.log4j:log4j-1.2-api:2.17.0 (1 constraints: 3c05443b)
+org.apache.logging.log4j:log4j-1.2-api:2.17.1 (1 constraints: 3d05453b)
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.props
index 45fa526..eec44fe 100644
--- a/versions.props
+++ b/versions.props
@@ -88,7 +88,7 @@ org.apache.httpcomponents:httpcore=4.4.13
org.apache.httpcomponents:httpmime=4.5.10
org.apache.james:apache-mime4j*=0.8.3
org.apache.kerby:*=1.0.1
-org.apache.logging.log4j:*=2.17.0
+org.apache.logging.log4j:*=2.17.1
org.apache.lucene:*=9.0.0
org.apache.opennlp:opennlp-tools=1.9.1
org.apache.pdfbox:*=2.0.24
