You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2021/12/23 09:36:40 UTC
[solr] branch main updated: SOLR-15871: Update Log4J to 2.17
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 d76bb5d SOLR-15871: Update Log4J to 2.17
d76bb5d is described below
commit d76bb5d93c3f77d436e31b003aad1267f93c42e6
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu Dec 23 10:36:14 2021 +0100
SOLR-15871: Update Log4J to 2.17
Signed-off-by: weidong <we...@uniontech.com>
---
solr/CHANGES.txt | 8 ++++++++
solr/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.17.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.17.0.jar.sha1 | 1 +
solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.16.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.17.0.jar.sha1 | 1 +
versions.lock | 8 ++++----
versions.props | 2 +-
15 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 67e20c2..c1f9dc3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -449,6 +449,14 @@ 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)
+
+================== 8.11.2 ==================
+
+Bug Fixes
+---------------------
+* SOLR-15871: Update Log4J to 2.17 (weidongkl via janhoy)
+
================== 8.11.1 ==================
Bug Fixes
diff --git a/solr/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.16.0.jar.sha1
deleted file mode 100644
index f5179d6..0000000
--- a/solr/licenses/log4j-1.2-api-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecbcfa4162e35b831705e97bbee546f81280ee6f
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
new file mode 100644
index 0000000..5dddc7e
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
diff --git a/solr/licenses/log4j-api-2.16.0.jar.sha1 b/solr/licenses/log4j-api-2.16.0.jar.sha1
deleted file mode 100644
index b95c0d0..0000000
--- a/solr/licenses/log4j-api-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4727d93a76616ffc4149dffac5801827c0f4ac71
diff --git a/solr/licenses/log4j-api-2.17.0.jar.sha1 b/solr/licenses/log4j-api-2.17.0.jar.sha1
new file mode 100644
index 0000000..17f60e4
--- /dev/null
+++ b/solr/licenses/log4j-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+bbd791e9c8c9421e45337c4fe0a10851c086e36c
diff --git a/solr/licenses/log4j-core-2.16.0.jar.sha1 b/solr/licenses/log4j-core-2.16.0.jar.sha1
deleted file mode 100644
index 953dbb9..0000000
--- a/solr/licenses/log4j-core-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca12fb3902ecfcba1e1357ebfc55407acec30ede
diff --git a/solr/licenses/log4j-core-2.17.0.jar.sha1 b/solr/licenses/log4j-core-2.17.0.jar.sha1
new file mode 100644
index 0000000..4ca8459
--- /dev/null
+++ b/solr/licenses/log4j-core-2.17.0.jar.sha1
@@ -0,0 +1 @@
+fe6e7a32c1228884b9691a744f953a55d0dd8ead
diff --git a/solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1
deleted file mode 100644
index d97f9bc..0000000
--- a/solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-257d34c9f0942a834ddd972f177c4e8c7da877cc
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
new file mode 100644
index 0000000..4d4e5ec
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.17.0.jar.sha1
@@ -0,0 +1 @@
+829615bbe0c4760f6895308a3730df9a9ba16831
diff --git a/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
deleted file mode 100644
index a34c4ea..0000000
--- a/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4cc7712ebb4744681db815679248e4312f61b32
diff --git a/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
new file mode 100644
index 0000000..9bf6939
--- /dev/null
+++ b/solr/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
@@ -0,0 +1 @@
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6
diff --git a/solr/licenses/log4j-web-2.16.0.jar.sha1 b/solr/licenses/log4j-web-2.16.0.jar.sha1
deleted file mode 100644
index 7624114..0000000
--- a/solr/licenses/log4j-web-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4bf36dca045fa113f625324013fbf57f938cd1c3
diff --git a/solr/licenses/log4j-web-2.17.0.jar.sha1 b/solr/licenses/log4j-web-2.17.0.jar.sha1
new file mode 100644
index 0000000..56bbe35
--- /dev/null
+++ b/solr/licenses/log4j-web-2.17.0.jar.sha1
@@ -0,0 +1 @@
+f668a2563a36bd5d07dcf2af21dd7220e43dcda6
diff --git a/versions.lock b/versions.lock
index a08cfb3..a04c2cf 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.16.0 (4 constraints: d43331b2)
-org.apache.logging.log4j:log4j-core:2.16.0 (2 constraints: 0f16f324)
-org.apache.logging.log4j:log4j-slf4j-impl:2.16.0 (1 constraints: 3b05413b)
+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.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.16.0 (1 constraints: 3b05413b)
+org.apache.logging.log4j:log4j-1.2-api:2.17.0 (1 constraints: 3c05443b)
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 bdeb4eb..45fa526 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.16.0
+org.apache.logging.log4j:*=2.17.0
org.apache.lucene:*=9.0.0
org.apache.opennlp:opennlp-tools=1.9.1
org.apache.pdfbox:*=2.0.24