Apache Solr open-source search software
Update io.grpc:grpc-* to v1.58.0 (#1769)
Solr Bot3d120f586d07
diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradleindex da555ce9165..c3372b45c06 100644--- a/gradle/validation/jar-checks.gradle+++ b/gradle/validation/jar-checks.gradle@@ -122,17 +122,24 @@ subprojects {}def visited = new HashSet<>()+ def seenDeps = new HashSet<>()def infos = []while (!queue.isEmpty()) {def dep = queue.removeFirst()+ seenDeps.add(dep)// Skip any artifacts from other Solr Modules (they will be resolved there).if (dep.moduleGroup == "org.apache.solr") {continue}- queue.addAll(dep.children)+ // Make sure we don't keep visiting the same children over and over again+ dep.children.each { child ->+ if (!seenDeps.contains(child)) {+ queue.add(child)+ }+ }dep.moduleArtifacts.each { resolvedArtifact ->def file = resolvedArtifact.fileif (visited.add(file)) {diff --git a/solr/licenses/grpc-alts-1.56.0.jar.sha1 b/solr/licenses/grpc-alts-1.56.0.jar.sha1deleted file mode 100644index f0bd97feeda..00000000000--- a/solr/licenses/grpc-alts-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-33ad69068719833876c4dee260ff1a07c6305a40diff --git a/solr/licenses/grpc-alts-1.58.0.jar.sha1 b/solr/licenses/grpc-alts-1.58.0.jar.sha1new file mode 100644index 00000000000..6019d9701e6--- /dev/null+++ b/solr/licenses/grpc-alts-1.58.0.jar.sha1@@ -0,0 +1 @@+7e5ae496f9d7ae266abe30aa2848cbb3426b244ediff --git a/solr/licenses/grpc-api-1.56.0.jar.sha1 b/solr/licenses/grpc-api-1.56.0.jar.sha1deleted file mode 100644index b31f565d65e..00000000000--- a/solr/licenses/grpc-api-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2149f665531882aa758dab24ba2556197c2c1fa6diff --git a/solr/licenses/grpc-api-1.58.0.jar.sha1 b/solr/licenses/grpc-api-1.58.0.jar.sha1new file mode 100644index 00000000000..e3782a67a1c--- /dev/null+++ b/solr/licenses/grpc-api-1.58.0.jar.sha1@@ -0,0 +1 @@+1f761949cdfd418a5f662e0d22d2c95f60099c0bdiff --git a/solr/licenses/grpc-auth-1.56.0.jar.sha1 b/solr/licenses/grpc-auth-1.56.0.jar.sha1deleted file mode 100644index 39dead62065..00000000000--- a/solr/licenses/grpc-auth-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6b9e8782b4ec666e684f7480cd3a9e1602e5cb41diff --git a/solr/licenses/grpc-auth-1.58.0.jar.sha1 b/solr/licenses/grpc-auth-1.58.0.jar.sha1new file mode 100644index 00000000000..15e05883800--- /dev/null+++ b/solr/licenses/grpc-auth-1.58.0.jar.sha1@@ -0,0 +1 @@+d7489cc1fc90658d43bf18307972db6b5305bb45diff --git a/solr/licenses/grpc-context-1.56.0.jar.sha1 b/solr/licenses/grpc-context-1.56.0.jar.sha1deleted file mode 100644index a91833df30d..00000000000--- a/solr/licenses/grpc-context-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9f690e203247b54cb120fbd6885e829c23385872diff --git a/solr/licenses/grpc-context-1.58.0.jar.sha1 b/solr/licenses/grpc-context-1.58.0.jar.sha1new file mode 100644index 00000000000..1a6b8003aa9--- /dev/null+++ b/solr/licenses/grpc-context-1.58.0.jar.sha1@@ -0,0 +1 @@+eae1e3ed15e40e3bd5c080a9bbb9a8eb1770afb7diff --git a/solr/licenses/grpc-core-1.56.0.jar.sha1 b/solr/licenses/grpc-core-1.56.0.jar.sha1deleted file mode 100644index f98291cb245..00000000000--- a/solr/licenses/grpc-core-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f9515b43a4f7a2d09c712cb6bce2659f036b2aa6diff --git a/solr/licenses/grpc-core-1.58.0.jar.sha1 b/solr/licenses/grpc-core-1.58.0.jar.sha1new file mode 100644index 00000000000..2c7016d5ee4--- /dev/null+++ b/solr/licenses/grpc-core-1.58.0.jar.sha1@@ -0,0 +1 @@+5a0fa4249397504443f7609754bf0acb50e0a0c5diff --git a/solr/licenses/grpc-googleapis-1.56.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.56.0.jar.sha1deleted file mode 100644index 535c95c2076..00000000000--- a/solr/licenses/grpc-googleapis-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3e0bfd8c00c14a7eb49914af818222f0fce900ecdiff --git a/solr/licenses/grpc-googleapis-1.58.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.58.0.jar.sha1new file mode 100644index 00000000000..60cd4edc0cd--- /dev/null+++ b/solr/licenses/grpc-googleapis-1.58.0.jar.sha1@@ -0,0 +1 @@+2327b1875165d99a9b0fe2b52e257dfe0af29d6adiff --git a/solr/licenses/grpc-grpclb-1.56.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.56.0.jar.sha1deleted file mode 100644index c60f086ea29..00000000000--- a/solr/licenses/grpc-grpclb-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a035c18bf9f9bb7b44a829f3079379deb95f8a47diff --git a/solr/licenses/grpc-grpclb-1.58.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.58.0.jar.sha1new file mode 100644index 00000000000..1760630283e--- /dev/null+++ b/solr/licenses/grpc-grpclb-1.58.0.jar.sha1@@ -0,0 +1 @@+1d4e60a8053e583fd23b002c468df715ce7ffdabdiff --git a/solr/licenses/grpc-netty-1.56.0.jar.sha1 b/solr/licenses/grpc-netty-1.56.0.jar.sha1deleted file mode 100644index fdf976d6acb..00000000000--- a/solr/licenses/grpc-netty-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7c3dfd5fe8d47a45fb9bcb3e35d8af38c415c773diff --git a/solr/licenses/grpc-netty-1.58.0.jar.sha1 b/solr/licenses/grpc-netty-1.58.0.jar.sha1new file mode 100644index 00000000000..6f2a083cf72--- /dev/null+++ b/solr/licenses/grpc-netty-1.58.0.jar.sha1@@ -0,0 +1 @@+96ae48464ce0496e08c6a1c27a75e2135214fc7adiff --git a/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1deleted file mode 100644index fca54546cd5..00000000000--- a/solr/licenses/grpc-netty-shaded-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c58703fd48769bc0e1629369c59c5a8a195fd8a8diff --git a/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1new file mode 100644index 00000000000..f37324555bc--- /dev/null+++ b/solr/licenses/grpc-netty-shaded-1.58.0.jar.sha1@@ -0,0 +1 @@+942622d5b4d908f9474ce5dbbdaa587e606cd9eddiff --git a/solr/licenses/grpc-protobuf-1.56.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.56.0.jar.sha1deleted file mode 100644index 95c72e81fcc..00000000000--- a/solr/licenses/grpc-protobuf-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-de43cf4ba0773cb1d6a32444ca487e3f35e6c6acdiff --git a/solr/licenses/grpc-protobuf-1.58.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.58.0.jar.sha1new file mode 100644index 00000000000..a9934c4200b--- /dev/null+++ b/solr/licenses/grpc-protobuf-1.58.0.jar.sha1@@ -0,0 +1 @@+2e16536d0b9c27e7b28bf916a528aa92e9ea872ddiff --git a/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1deleted file mode 100644index 656ee7e8096..00000000000--- a/solr/licenses/grpc-protobuf-lite-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-58e5b214be5422d5c217389617e5e760451e8abbdiff --git a/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1new file mode 100644index 00000000000..2f6c58b87af--- /dev/null+++ b/solr/licenses/grpc-protobuf-lite-1.58.0.jar.sha1@@ -0,0 +1 @@+60498c6688075a698ea3285587ed318aaf18d9dbdiff --git a/solr/licenses/grpc-rls-1.56.0.jar.sha1 b/solr/licenses/grpc-rls-1.56.0.jar.sha1deleted file mode 100644index 8769d38f5b8..00000000000--- a/solr/licenses/grpc-rls-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c7752ad0fab7ca0e88eb2b00d4c1f49c3168a46adiff --git a/solr/licenses/grpc-rls-1.58.0.jar.sha1 b/solr/licenses/grpc-rls-1.58.0.jar.sha1new file mode 100644index 00000000000..dd79cc96487--- /dev/null+++ b/solr/licenses/grpc-rls-1.58.0.jar.sha1@@ -0,0 +1 @@+705efa0a05acc2df20e369817f091bba59235d9fdiff --git a/solr/licenses/grpc-services-1.56.0.jar.sha1 b/solr/licenses/grpc-services-1.56.0.jar.sha1deleted file mode 100644index bcdd9e8af99..00000000000--- a/solr/licenses/grpc-services-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4c9b37b8228796c302a11b91d29775001082ab3fdiff --git a/solr/licenses/grpc-services-1.58.0.jar.sha1 b/solr/licenses/grpc-services-1.58.0.jar.sha1new file mode 100644index 00000000000..593048c5127--- /dev/null+++ b/solr/licenses/grpc-services-1.58.0.jar.sha1@@ -0,0 +1 @@+2dbe016ee80160b4dbb283ef8fc46a00294d952adiff --git a/solr/licenses/grpc-stub-1.56.0.jar.sha1 b/solr/licenses/grpc-stub-1.56.0.jar.sha1deleted file mode 100644index 9cd1024d906..00000000000--- a/solr/licenses/grpc-stub-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-46e5bc1caa5fc3ea50aaf386658a1c2bb57d84c8diff --git a/solr/licenses/grpc-stub-1.58.0.jar.sha1 b/solr/licenses/grpc-stub-1.58.0.jar.sha1new file mode 100644index 00000000000..b40e8a44d5a--- /dev/null+++ b/solr/licenses/grpc-stub-1.58.0.jar.sha1@@ -0,0 +1 @@+6bba82c4e3298ffbc2faa182821c98f6e3903d77diff --git a/solr/licenses/grpc-util-1.58.0.jar.sha1 b/solr/licenses/grpc-util-1.58.0.jar.sha1new file mode 100644index 00000000000..4b3ffa0ade4--- /dev/null+++ b/solr/licenses/grpc-util-1.58.0.jar.sha1@@ -0,0 +1 @@+1e95f31fe99adb642ec9d800ed950b438dfd0e50diff --git a/solr/licenses/grpc-xds-1.56.0.jar.sha1 b/solr/licenses/grpc-xds-1.56.0.jar.sha1deleted file mode 100644index 76138252a99..00000000000--- a/solr/licenses/grpc-xds-1.56.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2898653c90c8202ee1038d28d81f5cbedf2af545diff --git a/solr/licenses/grpc-xds-1.58.0.jar.sha1 b/solr/licenses/grpc-xds-1.58.0.jar.sha1new file mode 100644index 00000000000..3effe9ca8af--- /dev/null+++ b/solr/licenses/grpc-xds-1.58.0.jar.sha1@@ -0,0 +1 @@+2d60586187fb19850ee49e28b1664f7a539a6f66diff --git a/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1deleted file mode 100644index e8153102f9a..00000000000--- a/solr/licenses/proto-google-common-protos-2.19.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-77e361812583ea07ee248054ac5bd9f41dfa7532diff --git a/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1new file mode 100644index 00000000000..190d72d40b2--- /dev/null+++ b/solr/licenses/proto-google-common-protos-2.22.0.jar.sha1@@ -0,0 +1 @@+627126f6a05085dab0caba68dcdad118512975efdiff --git a/solr/licenses/protobuf-java-3.23.1.jar.sha1 b/solr/licenses/protobuf-java-3.23.1.jar.sha1deleted file mode 100644index be0b48e1975..00000000000--- a/solr/licenses/protobuf-java-3.23.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-06a138d6bb6b7554b0999300ef8340d134d5575ddiff --git a/solr/licenses/protobuf-java-3.24.0.jar.sha1 b/solr/licenses/protobuf-java-3.24.0.jar.sha1new file mode 100644index 00000000000..b1ebca307bd--- /dev/null+++ b/solr/licenses/protobuf-java-3.24.0.jar.sha1@@ -0,0 +1 @@+850a0efbee73911b2c30fa2238a549244524d31ediff --git a/versions.lock b/versions.lockindex 89aeb26dba5..b85e90cd52d 100644--- a/versions.lock+++ b/versions.lock@@ -30,7 +30,7 @@ com.google.api-client:google-api-client:2.2.0 (3 constraints: a132abfa)com.google.api.grpc:gapic-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)com.google.api.grpc:grpc-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)com.google.api.grpc:proto-google-cloud-storage-v2:2.22.3-alpha (2 constraints: e822e638)-com.google.api.grpc:proto-google-common-protos:2.19.1 (6 constraints: 334e2e90)+com.google.api.grpc:proto-google-common-protos:2.22.0 (6 constraints: 2f4e2390)com.google.api.grpc:proto-google-iam-v1:1.14.1 (2 constraints: e91ef3cc)com.google.apis:google-api-services-storage:v1-rev20230301-2.0.0 (2 constraints: ce258747)com.google.auth:google-auth-library-credentials:1.16.0 (6 constraints: 42584e93)@@ -41,10 +41,10 @@ com.google.cloud:google-cloud-core:2.18.1 (3 constraints: 502f7757)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 (6 constraints: 0c5507c0)-com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 8a894b63)+com.google.code.gson:gson:2.10.1 (7 constraints: 005f69b0)+com.google.errorprone:error_prone_annotations:2.22.0 (11 constraints: 6e891f5a)com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)-com.google.guava:guava:32.1.2-jre (25 constraints: 646b5109)+com.google.guava:guava:32.1.2-jre (26 constraints: fc7838d4)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)@@ -52,9 +52,9 @@ com.google.http-client:google-http-client-apache-v2:1.43.1 (2 constraints: b620ecom.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: 3a3da718)+com.google.j2objc:j2objc-annotations:2.8 (5 constraints: a6460661)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:3.24.0 (11 constraints: d095beaf)com.google.protobuf:protobuf-java-util:3.23.1 (3 constraints: 302be32a)com.google.re2j:re2j:1.7 (2 constraints: 3814d46f)com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)@@ -94,36 +94,37 @@ io.dropwizard.metrics:metrics-graphite:4.2.20 (1 constraints: 3a05413b)io.dropwizard.metrics:metrics-jetty10:4.2.20 (1 constraints: 3a05413b)io.dropwizard.metrics:metrics-jmx:4.2.20 (1 constraints: 3a05413b)io.dropwizard.metrics:metrics-jvm:4.2.20 (1 constraints: 3a05413b)-io.grpc:grpc-alts:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-api:1.56.0 (5 constraints: a43684b7)-io.grpc:grpc-auth:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-context:1.56.0 (4 constraints: 2f2a2aec)-io.grpc:grpc-core:1.56.0 (2 constraints: ec1894f9)-io.grpc:grpc-googleapis:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-grpclb:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-netty:1.56.0 (1 constraints: 3e054b3b)-io.grpc:grpc-netty-shaded:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-protobuf:1.56.0 (2 constraints: 5d159cd7)-io.grpc:grpc-protobuf-lite:1.56.0 (2 constraints: 291aeb4d)-io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)-io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)-io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)+io.grpc:grpc-alts:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-api:1.58.0 (6 constraints: 4b405ed0)+io.grpc:grpc-auth:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-context:1.58.0 (4 constraints: a22a191e)+io.grpc:grpc-core:1.58.0 (3 constraints: 4621731f)+io.grpc:grpc-googleapis:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-grpclb:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-netty:1.58.0 (1 constraints: 4005513b)+io.grpc:grpc-netty-shaded:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-protobuf:1.58.0 (2 constraints: 5f1500d8)+io.grpc:grpc-protobuf-lite:1.58.0 (2 constraints: 2b1af14d)+io.grpc:grpc-rls:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-services:1.58.0 (1 constraints: 20100fa6)+io.grpc:grpc-stub:1.58.0 (2 constraints: 5f1500d8)+io.grpc:grpc-util:1.58.0 (3 constraints: 2d1a087d)+io.grpc:grpc-xds:1.58.0 (1 constraints: 20100fa6)io.netty:netty-buffer:4.1.99.Final (10 constraints: de999d1c)io.netty:netty-codec:4.1.99.Final (5 constraints: 79452589)io.netty:netty-codec-http:4.1.99.Final (3 constraints: 6124fbef)-io.netty:netty-codec-http2:4.1.99.Final (1 constraints: ed0a94cb)+io.netty:netty-codec-http2:4.1.99.Final (1 constraints: ea0a80cb)io.netty:netty-codec-socks:4.1.99.Final (1 constraints: 190fce6c)io.netty:netty-common:4.1.99.Final (12 constraints: 60b319a3)io.netty:netty-handler:4.1.99.Final (3 constraints: 782b0b3f)-io.netty:netty-handler-proxy:4.1.99.Final (1 constraints: ed0a94cb)+io.netty:netty-handler-proxy:4.1.99.Final (1 constraints: ea0a80cb)io.netty:netty-resolver:4.1.99.Final (2 constraints: 621a2533)io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)io.netty:netty-transport:4.1.99.Final (9 constraints: 268c2655)io.netty:netty-transport-classes-epoll:4.1.99.Final (1 constraints: b6121b1f)io.netty:netty-transport-native-epoll:4.1.99.Final (1 constraints: da0f128f)-io.netty:netty-transport-native-unix-common:4.1.99.Final (4 constraints: 673d3899)+io.netty:netty-transport-native-unix-common:4.1.99.Final (4 constraints: 643d7197)io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)diff --git a/versions.props b/versions.propsindex 4ced9981429..cc43d9abc31 100644--- a/versions.props+++ b/versions.props@@ -21,7 +21,7 @@ commons-codec:commons-codec=1.16.0commons-collections:commons-collections=3.2.2commons-io:commons-io=2.14.0io.dropwizard.metrics:*=4.2.20-io.grpc:grpc-*=1.56.0+io.grpc:grpc-*=1.58.0io.netty:*=4.1.99.Finalio.opentelemetry:opentelemetry-bom=1.30.1io.prometheus:*=0.16.0