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 2022/01/03 13:08:20 UTC
[lucene-solr] branch branch_8_11 updated: SOLR-15871: Update Log4J to 2.17.1 (#2635)
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 e7df758 SOLR-15871: Update Log4J to 2.17.1 (#2635)
e7df758 is described below
commit e7df75816fbfc195ab1c78a214c069c015e5614f
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Mon Jan 3 14:07:54 2022 +0100
SOLR-15871: Update Log4J to 2.17.1 (#2635)
---
lucene/ivy-versions.properties | 2 +-
lucene/licenses/log4j-api-2.17.0.jar.sha1 | 1 -
lucene/licenses/log4j-api-2.17.1.jar.sha1 | 1 +
lucene/licenses/log4j-core-2.17.0.jar.sha1 | 1 -
lucene/licenses/log4j-core-2.17.1.jar.sha1 | 1 +
solr/CHANGES.txt | 2 +-
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 +
18 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index afff4e2..2ce0f2b 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.17.0
+org.apache.logging.log4j.version = 2.17.1
/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.17.0.jar.sha1 b/lucene/licenses/log4j-api-2.17.0.jar.sha1
deleted file mode 100644
index 17f60e4..0000000
--- a/lucene/licenses/log4j-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbd791e9c8c9421e45337c4fe0a10851c086e36c
diff --git a/lucene/licenses/log4j-api-2.17.1.jar.sha1 b/lucene/licenses/log4j-api-2.17.1.jar.sha1
new file mode 100644
index 0000000..acdf9dd
--- /dev/null
+++ b/lucene/licenses/log4j-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+d771af8e336e372fb5399c99edabe0919aeaf5b2
diff --git a/lucene/licenses/log4j-core-2.17.0.jar.sha1 b/lucene/licenses/log4j-core-2.17.0.jar.sha1
deleted file mode 100644
index 4ca8459..0000000
--- a/lucene/licenses/log4j-core-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe6e7a32c1228884b9691a744f953a55d0dd8ead
diff --git a/lucene/licenses/log4j-core-2.17.1.jar.sha1 b/lucene/licenses/log4j-core-2.17.1.jar.sha1
new file mode 100644
index 0000000..aa16b80
--- /dev/null
+++ b/lucene/licenses/log4j-core-2.17.1.jar.sha1
@@ -0,0 +1 @@
+779f60f3844dadc3ef597976fcb1e5127b1f343d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 300adb9..fb9f213 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
---------------------
-* 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