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 d2c49c6 SOLR-15843: Update Log4J from 2.15 to 2.16 (#457)
d2c49c6 is described below
commit d2c49c6ed6e0238f6184313e83f9d23deb5ec960
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Dec 14 02:40:46 2021 +0100
SOLR-15843: Update Log4J from 2.15 to 2.16 (#457)
---
solr/CHANGES.txt | 2 +-
solr/licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.16.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.16.0.jar.sha1 | 1 +
solr/licenses/log4j-layout-template-json-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.15.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.16.0.jar.sha1 | 1 +
versions.lock | 8 ++++----
versions.props | 2 +-
15 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a798188..a06b1b8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -476,7 +476,7 @@ Bug Fixes
* SOLR-8319: Fix NPE in pivot facets, add non-Analyzed query method in
FieldType. (Houston Putman, Isabelle Giguere)
-* SOLR-15843: Update Log4J to 2.15 (Mike Drob)
+* SOLR-15843: Update Log4J to 2.16 (Mike Drob, janhoy)
================== 8.11.0 ==================
diff --git a/solr/licenses/log4j-1.2-api-2.15.0.jar.sha1
b/solr/licenses/log4j-1.2-api-2.15.0.jar.sha1
deleted file mode 100644
index 5eb0d83..0000000
--- a/solr/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
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
new file mode 100644
index 0000000..f5179d6
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/solr/licenses/log4j-api-2.15.0.jar.sha1
b/solr/licenses/log4j-api-2.15.0.jar.sha1
deleted file mode 100644
index 460ceee..0000000
--- a/solr/licenses/log4j-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
diff --git a/solr/licenses/log4j-api-2.16.0.jar.sha1
b/solr/licenses/log4j-api-2.16.0.jar.sha1
new file mode 100644
index 0000000..b95c0d0
--- /dev/null
+++ b/solr/licenses/log4j-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+4727d93a76616ffc4149dffac5801827c0f4ac71
diff --git a/solr/licenses/log4j-core-2.15.0.jar.sha1
b/solr/licenses/log4j-core-2.15.0.jar.sha1
deleted file mode 100644
index 7ed9852..0000000
--- a/solr/licenses/log4j-core-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba55c13d7ac2fd44df9cc8074455719a33f375b9
diff --git a/solr/licenses/log4j-core-2.16.0.jar.sha1
b/solr/licenses/log4j-core-2.16.0.jar.sha1
new file mode 100644
index 0000000..953dbb9
--- /dev/null
+++ b/solr/licenses/log4j-core-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ca12fb3902ecfcba1e1357ebfc55407acec30ede
diff --git a/solr/licenses/log4j-layout-template-json-2.15.0.jar.sha1
b/solr/licenses/log4j-layout-template-json-2.15.0.jar.sha1
deleted file mode 100644
index 49d1720..0000000
--- a/solr/licenses/log4j-layout-template-json-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-295580f2a67d6af4e276dd415dc3d78cf0167208
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
new file mode 100644
index 0000000..d97f9bc
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.16.0.jar.sha1
@@ -0,0 +1 @@
+257d34c9f0942a834ddd972f177c4e8c7da877cc
diff --git a/solr/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
b/solr/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
deleted file mode 100644
index d967b11..0000000
--- a/solr/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
diff --git a/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
b/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
new file mode 100644
index 0000000..a34c4ea
--- /dev/null
+++ b/solr/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
@@ -0,0 +1 @@
+d4cc7712ebb4744681db815679248e4312f61b32
diff --git a/solr/licenses/log4j-web-2.15.0.jar.sha1
b/solr/licenses/log4j-web-2.15.0.jar.sha1
deleted file mode 100644
index 83513b1..0000000
--- a/solr/licenses/log4j-web-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e2b1512cb85e38326844bdb707b6673e0e70eeb
diff --git a/solr/licenses/log4j-web-2.16.0.jar.sha1
b/solr/licenses/log4j-web-2.16.0.jar.sha1
new file mode 100644
index 0000000..7624114
--- /dev/null
+++ b/solr/licenses/log4j-web-2.16.0.jar.sha1
@@ -0,0 +1 @@
+4bf36dca045fa113f625324013fbf57f938cd1c3
diff --git a/versions.lock b/versions.lock
index 668f9fa..a08cfb3 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.15.0 (4 constraints: d03302b1)
-org.apache.logging.log4j:log4j-core:2.15.0 (2 constraints: 0d16ba24)
-org.apache.logging.log4j:log4j-slf4j-impl:2.15.0 (1 constraints: 3a053e3b)
+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.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.15.0 (1 constraints: 3a053e3b)
+org.apache.logging.log4j:log4j-1.2-api:2.16.0 (1 constraints: 3b05413b)
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 c7f6e34..bdeb4eb 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.15.0
+org.apache.logging.log4j:*=2.16.0
org.apache.lucene:*=9.0.0
org.apache.opennlp:opennlp-tools=1.9.1
org.apache.pdfbox:*=2.0.24
