You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2021/09/01 17:15:39 UTC
[lucene-solr] branch branch_8x updated: SOLR-15609: Upgrade log4j
to 2.14.1
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 87349a9 SOLR-15609: Upgrade log4j to 2.14.1
87349a9 is described below
commit 87349a9adf7ea1bb0b397962f44e21751b68489a
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Wed Sep 1 10:15:14 2021 -0700
SOLR-15609: Upgrade log4j to 2.14.1
---
lucene/ivy-versions.properties | 2 +-
lucene/licenses/log4j-api-2.13.2.jar.sha1 | 1 -
lucene/licenses/log4j-api-2.14.1.jar.sha1 | 1 +
lucene/licenses/log4j-core-2.13.2.jar.sha1 | 1 -
lucene/licenses/log4j-core-2.14.1.jar.sha1 | 1 +
solr/CHANGES.txt | 2 ++
solr/licenses/log4j-1.2-api-2.13.2.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.14.1.jar.sha1 | 1 +
solr/licenses/log4j-api-2.13.2.jar.sha1 | 1 -
solr/licenses/log4j-api-2.14.1.jar.sha1 | 1 +
solr/licenses/log4j-core-2.13.2.jar.sha1 | 1 -
solr/licenses/log4j-core-2.14.1.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1 | 1 +
solr/licenses/log4j-web-2.13.2.jar.sha1 | 1 -
solr/licenses/log4j-web-2.14.1.jar.sha1 | 1 +
16 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 21a9053..9ac6e88 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.13.2
+org.apache.logging.log4j.version = 2.14.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.13.2.jar.sha1 b/lucene/licenses/log4j-api-2.13.2.jar.sha1
deleted file mode 100644
index a982649..0000000
--- a/lucene/licenses/log4j-api-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-567ea514dedd8679c429c5b5b39b0d67b6464c3c
diff --git a/lucene/licenses/log4j-api-2.14.1.jar.sha1 b/lucene/licenses/log4j-api-2.14.1.jar.sha1
new file mode 100644
index 0000000..650ed8c
--- /dev/null
+++ b/lucene/licenses/log4j-api-2.14.1.jar.sha1
@@ -0,0 +1 @@
+cd8858fbbde69f46bce8db1152c18a43328aae78
diff --git a/lucene/licenses/log4j-core-2.13.2.jar.sha1 b/lucene/licenses/log4j-core-2.13.2.jar.sha1
deleted file mode 100644
index ce26d9c..0000000
--- a/lucene/licenses/log4j-core-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8eb1fc1914eb2550bf3ddea26917c9a7cbb00593
diff --git a/lucene/licenses/log4j-core-2.14.1.jar.sha1 b/lucene/licenses/log4j-core-2.14.1.jar.sha1
new file mode 100644
index 0000000..692beb9
--- /dev/null
+++ b/lucene/licenses/log4j-core-2.14.1.jar.sha1
@@ -0,0 +1 @@
+9141212b8507ab50a45525b545b39d224614528b
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2fed1ca..c0fd641 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -53,6 +53,8 @@ Improvements
* SOLR-15599: Upgrade AWS SDK from v1 to v2 for S3 Repository (Houston Putman)
+* SOLR-15609: Upgrade log4j to 2.14.1 (hossman)
+
Optimizations
---------------------
* SOLR-15433: Replace transient core cache LRU by Caffeine cache. (Bruno Roustant)
diff --git a/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1
deleted file mode 100644
index 78679ce..0000000
--- a/solr/licenses/log4j-1.2-api-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d05a7928403d9a8b37d66dc85319c33e5dba17dd
diff --git a/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1 b/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1
new file mode 100644
index 0000000..ef0bdbd
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.14.1.jar.sha1
@@ -0,0 +1 @@
+6bfcc76fa1a1a41295aff0042200aaa82d9ac286
diff --git a/solr/licenses/log4j-api-2.13.2.jar.sha1 b/solr/licenses/log4j-api-2.13.2.jar.sha1
deleted file mode 100644
index a982649..0000000
--- a/solr/licenses/log4j-api-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-567ea514dedd8679c429c5b5b39b0d67b6464c3c
diff --git a/solr/licenses/log4j-api-2.14.1.jar.sha1 b/solr/licenses/log4j-api-2.14.1.jar.sha1
new file mode 100644
index 0000000..650ed8c
--- /dev/null
+++ b/solr/licenses/log4j-api-2.14.1.jar.sha1
@@ -0,0 +1 @@
+cd8858fbbde69f46bce8db1152c18a43328aae78
diff --git a/solr/licenses/log4j-core-2.13.2.jar.sha1 b/solr/licenses/log4j-core-2.13.2.jar.sha1
deleted file mode 100644
index ce26d9c..0000000
--- a/solr/licenses/log4j-core-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8eb1fc1914eb2550bf3ddea26917c9a7cbb00593
diff --git a/solr/licenses/log4j-core-2.14.1.jar.sha1 b/solr/licenses/log4j-core-2.14.1.jar.sha1
new file mode 100644
index 0000000..692beb9
--- /dev/null
+++ b/solr/licenses/log4j-core-2.14.1.jar.sha1
@@ -0,0 +1 @@
+9141212b8507ab50a45525b545b39d224614528b
diff --git a/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1
deleted file mode 100644
index 58fa437..0000000
--- a/solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe
diff --git a/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1
new file mode 100644
index 0000000..4731cdb
--- /dev/null
+++ b/solr/licenses/log4j-slf4j-impl-2.14.1.jar.sha1
@@ -0,0 +1 @@
+9a40554b8dab7ac9606089c87ae8a5ba914ec932
diff --git a/solr/licenses/log4j-web-2.13.2.jar.sha1 b/solr/licenses/log4j-web-2.13.2.jar.sha1
deleted file mode 100644
index 5dad454..0000000
--- a/solr/licenses/log4j-web-2.13.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb0fd4f049e77ced8db9b7706d33681c73ecb7e4
diff --git a/solr/licenses/log4j-web-2.14.1.jar.sha1 b/solr/licenses/log4j-web-2.14.1.jar.sha1
new file mode 100644
index 0000000..a0aedbf
--- /dev/null
+++ b/solr/licenses/log4j-web-2.14.1.jar.sha1
@@ -0,0 +1 @@
+cab83afbb8f2efdc730035b86d6f7b170c3cc2e7