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 2023/09/15 07:54:46 UTC
[solr] 05/06: Update org.slf4j:* to v2.0.9 (#1909)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 8f79f444a7c05f100a6e9df8be15c1c8889c75d7
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Fri Sep 15 08:52:11 2023 +0200
Update org.slf4j:* to v2.0.9 (#1909)
Cherry-picked from cd689747df9e68205e2a7162dd6a9f13c6686fd9
---
solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1 | 1 -
solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-2.0.7.jar.sha1 | 1 -
solr/licenses/jul-to-slf4j-2.0.9.jar.sha1 | 1 +
solr/licenses/slf4j-api-2.0.7.jar.sha1 | 1 -
solr/licenses/slf4j-api-2.0.9.jar.sha1 | 1 +
versions.lock | 15 ++++++++-------
versions.props | 2 +-
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1
deleted file mode 100644
index 53b9f52d334..00000000000
--- a/solr/licenses/jcl-over-slf4j-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f127fe5ee53404a8b3697cdd032dd1dd6a29dd77
diff --git a/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1
new file mode 100644
index 00000000000..f83ae3d65d6
--- /dev/null
+++ b/solr/licenses/jcl-over-slf4j-2.0.9.jar.sha1
@@ -0,0 +1 @@
+89eb336cf1183ce075253c7c3788aa196d56f71a
diff --git a/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1
deleted file mode 100644
index e10691c491c..00000000000
--- a/solr/licenses/jul-to-slf4j-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a48f44aeaa8a5ddc347007298a28173ac1fbbd8b
diff --git a/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1
new file mode 100644
index 00000000000..37d41afc3d3
--- /dev/null
+++ b/solr/licenses/jul-to-slf4j-2.0.9.jar.sha1
@@ -0,0 +1 @@
+09ef7c70b248185845f013f49a33ff9ca65b7975
diff --git a/solr/licenses/slf4j-api-2.0.7.jar.sha1 b/solr/licenses/slf4j-api-2.0.7.jar.sha1
deleted file mode 100644
index bed0f0b9a1c..00000000000
--- a/solr/licenses/slf4j-api-2.0.7.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41eb7184ea9d556f23e18b5cb99cad1f8581fc00
diff --git a/solr/licenses/slf4j-api-2.0.9.jar.sha1 b/solr/licenses/slf4j-api-2.0.9.jar.sha1
new file mode 100644
index 00000000000..378a2a8226d
--- /dev/null
+++ b/solr/licenses/slf4j-api-2.0.9.jar.sha1
@@ -0,0 +1 @@
+7cf2726fdcfbc8610f9a71fb3ed639871f315340
diff --git a/versions.lock b/versions.lock
index eb6ec6f69b9..124bab56240 100644
--- a/versions.lock
+++ b/versions.lock
@@ -42,16 +42,17 @@ com.google.cloud:google-cloud-core-grpc:2.18.1 (1 constraints: 20100ea6)
com.google.cloud:google-cloud-core-http:2.18.1 (1 constraints: 20100ea6)
com.google.cloud:google-cloud-storage:2.22.3 (2 constraints: d31c1c27)
com.google.code.gson:gson:2.10.1 (7 constraints: 88613f16)
-com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: 0487ebc0)
+com.google.errorprone:error_prone_annotations:2.18.0 (11 constraints: bb893df4)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:32.0.1-jre (25 constraints: 346ecb71)
+com.google.guava:guava:32.1.2-jre (25 constraints: 366e017a)
+com.google.guava:guava-parent:32.1.2-jre (1 constraints: b80ba5eb)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
com.google.http-client:google-http-client:1.43.1 (11 constraints: 2fbf7ea4)
com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620e575)
com.google.http-client:google-http-client-appengine:1.43.1 (2 constraints: da207181)
com.google.http-client:google-http-client-gson:1.43.1 (7 constraints: 5a70c647)
com.google.http-client:google-http-client-jackson2:1.43.1 (1 constraints: 1d1005a6)
-com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 833aea56)
+com.google.j2objc:j2objc-annotations:2.8 (4 constraints: 3a3da718)
com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
com.google.protobuf:protobuf-java:3.23.1 (11 constraints: d095caae)
com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)
@@ -276,7 +277,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.33.0 (5 constraints: 57468bea)
+org.checkerframework:checker-qual:3.33.0 (5 constraints: 0e494d11)
org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
@@ -351,9 +352,9 @@ org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:5.1.0 (1 constraints: 08050736)
-org.slf4j:jcl-over-slf4j:2.0.7 (3 constraints: cd1757a6)
-org.slf4j:jul-to-slf4j:2.0.7 (3 constraints: 27289948)
-org.slf4j:slf4j-api:2.0.7 (62 constraints: cd373f8d)
+org.slf4j:jcl-over-slf4j:2.0.9 (3 constraints: cf17cfa6)
+org.slf4j:jul-to-slf4j:2.0.9 (3 constraints: 29286349)
+org.slf4j:slf4j-api:2.0.9 (62 constraints: d33729a3)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index d28ffc1433d..ddc79b2d1f3 100644
--- a/versions.props
+++ b/versions.props
@@ -69,6 +69,6 @@ org.openjdk.jmh:*=1.37
org.osgi:osgi.annotation=8.1.0
org.quicktheories:quicktheories=0.26
org.semver4j:semver4j=5.1.0
-org.slf4j:*=2.0.7
+org.slf4j:*=2.0.9
org.xerial.snappy:snappy-java=1.1.10.1
software.amazon.awssdk:*=2.20.128