You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/12/23 09:45:18 UTC
[lucene-solr] branch branch_8_11 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 branch_8_11
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_11 by this push:
new bcdb449 SOLR-15871: Update Log4J to 2.17
bcdb449 is described below
commit bcdb4491996142ee9ca037abcafee8b441734d5c
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Thu Dec 23 10:28:54 2021 +0100
SOLR-15871: Update Log4J to 2.17
---
lucene/ivy-versions.properties | 2 +-
lucene/licenses/log4j-api-2.16.0.jar.sha1 | 1 -
lucene/licenses/log4j-api-2.17.0.jar.sha1 | 1 +
lucene/licenses/log4j-core-2.16.0.jar.sha1 | 1 -
lucene/licenses/log4j-core-2.17.0.jar.sha1 | 1 +
solr/CHANGES.txt | 2 +-
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 +
18 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 3b314c7..afff4e2 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -234,7 +234,7 @@ org.apache.kerby.version = 1.0.1
/org.apache.kerby/kerby-pkix = ${org.apache.kerby.version}
/org.apache.kerby/kerby-util = ${org.apache.kerby.version}
-org.apache.logging.log4j.version = 2.16.0
+org.apache.logging.log4j.version = 2.17.0
/org.apache.logging.log4j/log4j-1.2-api = ${org.apache.logging.log4j.version}
/org.apache.logging.log4j/log4j-api = ${org.apache.logging.log4j.version}
/org.apache.logging.log4j/log4j-core = ${org.apache.logging.log4j.version}
diff --git a/lucene/licenses/log4j-api-2.16.0.jar.sha1 b/lucene/licenses/log4j-api-2.16.0.jar.sha1
deleted file mode 100644
index b95c0d0..0000000
--- a/lucene/licenses/log4j-api-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4727d93a76616ffc4149dffac5801827c0f4ac71
diff --git a/lucene/licenses/log4j-api-2.17.0.jar.sha1 b/lucene/licenses/log4j-api-2.17.0.jar.sha1
new file mode 100644
index 0000000..17f60e4
--- /dev/null
+++ b/lucene/licenses/log4j-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+bbd791e9c8c9421e45337c4fe0a10851c086e36c
diff --git a/lucene/licenses/log4j-core-2.16.0.jar.sha1 b/lucene/licenses/log4j-core-2.16.0.jar.sha1
deleted file mode 100644
index 953dbb9..0000000
--- a/lucene/licenses/log4j-core-2.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ca12fb3902ecfcba1e1357ebfc55407acec30ede
diff --git a/lucene/licenses/log4j-core-2.17.0.jar.sha1 b/lucene/licenses/log4j-core-2.17.0.jar.sha1
new file mode 100644
index 0000000..4ca8459
--- /dev/null
+++ b/lucene/licenses/log4j-core-2.17.0.jar.sha1
@@ -0,0 +1 @@
+fe6e7a32c1228884b9691a744f953a55d0dd8ead
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 304137d..300adb9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -10,7 +10,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Bug Fixes
---------------------
-(No changes)
+* SOLR-15871: Update Log4J to 2.17 (weidongkl via janhoy)
================== 8.11.1 ==================
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