Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Update io.grpc:grpc-* to v1.78.0 (branch_9x) - abandoned
type: dependency_update
authors:
- name: solrbot
links:
- name: PR#3560
url: https://github.com/apache/solr/pull/3560
4 changes: 3 additions & 1 deletion gradle/validation/jar-checks.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ subprojects {
def file = resolvedArtifact.file
if (visited.add(file)) {
infos.add([
name : resolvedArtifact.name,
// resolvedArtifact.name may contain path separators when Gradle uses capability-based
// variant redirection (e.g. guava:android redirects to guava:jre). Extract only the filename part.
name : new File(resolvedArtifact.name).name,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explanation by Claude for this change:

Root cause of validateJarLicenses failure: When gRPC 1.80.0 pulls in guava:33.5.0-android, Gradle's capability-based variant selection resolves it to guava-33.5.0-jre.jar, but resolvedArtifact.name returns a relative path ../33.5.0-jre/guava-33.5.0-jre instead of just guava. This caused the license lookup to traverse out of licensesDir.

Fix in gradle/validation/jar-checks.gradle: In collectJarInfos, extract just the filename part of resolvedArtifact.name using new File(resolvedArtifact.name).name, which correctly handles path components from capability redirects.

jarName : file.toPath().getFileName().toString(),
path : file,
module : resolvedArtifact.moduleVersion,
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/failureaccess-1.0.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/failureaccess-1.0.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aeaffd00d57023a2c947393ed251f0354f0985fc
1 change: 0 additions & 1 deletion solr/licenses/grpc-alts-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-alts-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
73f4f60f2f22305c03784ea90f46e8d9af97b20e
1 change: 0 additions & 1 deletion solr/licenses/grpc-api-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-api-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
55f7b74a476f7f1815cb823b1a56b7ffd68e5043
1 change: 0 additions & 1 deletion solr/licenses/grpc-auth-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-auth-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e81fba2c16ffcc812a2b5541aaea47ce3bb50392
1 change: 0 additions & 1 deletion solr/licenses/grpc-context-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-context-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3fd476c0303c84ee5abe9a639f13020660f13b0
1 change: 0 additions & 1 deletion solr/licenses/grpc-core-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-core-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aae1d22e5a816650e1e7408f2f766bf769de76f1
1 change: 0 additions & 1 deletion solr/licenses/grpc-googleapis-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-googleapis-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9b223e2dc54591311ca171eb429841c9f0654b66
1 change: 0 additions & 1 deletion solr/licenses/grpc-grpclb-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-grpclb-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
28c9e8f262834c8a61faeba9e5c27261f88a40eb
1 change: 0 additions & 1 deletion solr/licenses/grpc-inprocess-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-inprocess-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
51b7c00db7070fcbc7b468533fb591d54385e327
1 change: 0 additions & 1 deletion solr/licenses/grpc-netty-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-netty-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3c8b1ed43f626498adc2dae078e3f240db5b154
1 change: 0 additions & 1 deletion solr/licenses/grpc-netty-shaded-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
90211b872a6fd7eefca494295549ed31cf5386c7
1 change: 0 additions & 1 deletion solr/licenses/grpc-protobuf-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-protobuf-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0fdcc7d6170bc4742ffb4581ebe5aaa25ada494f
1 change: 0 additions & 1 deletion solr/licenses/grpc-protobuf-lite-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4fb2ba34b3b3f59bd65af3bf080b5fd55179215a
1 change: 0 additions & 1 deletion solr/licenses/grpc-rls-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-rls-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6f42e364ba054d6f39e9342c3db67fd59a352f92
1 change: 0 additions & 1 deletion solr/licenses/grpc-services-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-services-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f50a01610e071cd37390beedc6ac39f8990ff30c
1 change: 0 additions & 1 deletion solr/licenses/grpc-stub-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-stub-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec14c383fd33981790afd29b4c3da231035087b0
1 change: 0 additions & 1 deletion solr/licenses/grpc-util-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-util-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
732e362b854ae44c0c102281d9192ce906d0d884
1 change: 0 additions & 1 deletion solr/licenses/grpc-xds-1.65.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-xds-1.80.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
090e6d2faf6f8a4871167f83c977be1309445337
1 change: 0 additions & 1 deletion solr/licenses/gson-2.11.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/gson-2.12.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e773a317740b83b43cfc3d652962856041697cb
1 change: 0 additions & 1 deletion solr/licenses/guava-33.1.0-jre.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/guava-33.5.0-jre.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8699de25f2f979108d6c1b804a7ba38cda1116bc
1 change: 0 additions & 1 deletion solr/licenses/j2objc-annotations-3.0.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/j2objc-annotations-3.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a892ca9507839bbdb900d64310ac98256cab992f
1 change: 0 additions & 1 deletion solr/licenses/proto-google-common-protos-2.41.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/proto-google-common-protos-2.63.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da5f87b9b7ade71856fe569f89c6af036d429888
60 changes: 30 additions & 30 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ com.google.api-client:google-api-client:2.6.0 (3 constraints: ad32fffc)
com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438)
com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438)
com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438)
com.google.api.grpc:proto-google-common-protos:2.41.0 (6 constraints: 184eab81)
com.google.api.grpc:proto-google-common-protos:2.63.2 (6 constraints: 184eab81)
com.google.api.grpc:proto-google-iam-v1:1.36.0 (2 constraints: ef1e9acd)
com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0 (2 constraints: da256149)
com.google.auth:google-auth-library-credentials:1.23.0 (7 constraints: cb686112)
Expand All @@ -39,19 +39,19 @@ com.google.cloud:google-cloud-core:2.40.0 (3 constraints: 3e2f1a54)
com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626)
com.google.code.gson:gson:2.11.0 (7 constraints: f462d514)
com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 72cf7ec0)
com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37)
com.google.guava:guava:33.1.0-jre (24 constraints: 716c78d6)
com.google.code.gson:gson:2.12.1 (7 constraints: f6622515)
com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 7ecfefc1)
com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037)
com.google.guava:guava:33.5.0-android (25 constraints: 7377327c)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
com.google.http-client:google-http-client:1.44.2 (11 constraints: 45bf29b8)
com.google.http-client:google-http-client-apache-v2:1.44.2 (2 constraints: b9201d76)
com.google.http-client:google-http-client-appengine:1.44.2 (2 constraints: de20d781)
com.google.http-client:google-http-client-gson:1.44.2 (7 constraints: 68702d4e)
com.google.http-client:google-http-client-jackson2:1.44.2 (1 constraints: 1f1009a6)
com.google.j2objc:j2objc-annotations:3.0.0 (4 constraints: 453c9e88)
com.google.j2objc:j2objc-annotations:3.1 (5 constraints: fc45ffbf)
com.google.oauth-client:google-oauth-client:1.36.0 (2 constraints: b720ee75)
com.google.protobuf:protobuf-java:3.25.8 (9 constraints: 3e833c8f)
com.google.protobuf:protobuf-java:3.25.8 (9 constraints: 4a83db95)
com.google.protobuf:protobuf-java-util:3.25.8 (4 constraints: 7f30200a)
com.google.re2j:re2j:1.8 (2 constraints: 3a140270)
com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798)
Expand Down Expand Up @@ -95,42 +95,42 @@ io.dropwizard.metrics:metrics-jmx:4.2.26 (1 constraints: 4005473b)
io.dropwizard.metrics:metrics-json:4.2.26 (1 constraints: 1d1183c9)
io.dropwizard.metrics:metrics-jvm:4.2.26 (2 constraints: 5c16b800)
io.dropwizard.metrics:metrics-servlets:4.2.26 (1 constraints: 4005473b)
io.grpc:grpc-alts:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-api:1.65.1 (8 constraints: 6951e68b)
io.grpc:grpc-auth:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-context:1.65.1 (6 constraints: 8f445188)
io.grpc:grpc-core:1.65.1 (3 constraints: 4321151f)
io.grpc:grpc-googleapis:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-grpclb:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-inprocess:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-netty:1.65.1 (1 constraints: 3f054d3b)
io.grpc:grpc-netty-shaded:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-protobuf:1.65.1 (2 constraints: 5d15c9d7)
io.grpc:grpc-protobuf-lite:1.65.1 (2 constraints: 291aca4d)
io.grpc:grpc-rls:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-services:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-stub:1.65.1 (2 constraints: 5d15c9d7)
io.grpc:grpc-util:1.65.1 (2 constraints: ec1876f9)
io.grpc:grpc-xds:1.65.1 (1 constraints: 1f100ba6)
io.grpc:grpc-alts:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-api:1.80.0 (8 constraints: 4d510a82)
io.grpc:grpc-auth:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-context:1.80.0 (6 constraints: 8344a583)
io.grpc:grpc-core:1.80.0 (3 constraints: 3b21991e)
io.grpc:grpc-googleapis:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-grpclb:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-inprocess:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-netty:1.80.0 (1 constraints: 3b05453b)
io.grpc:grpc-netty-shaded:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-protobuf:1.80.0 (2 constraints: 591505d7)
io.grpc:grpc-protobuf-lite:1.80.0 (2 constraints: 251ac24d)
io.grpc:grpc-rls:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-services:1.80.0 (1 constraints: 1f100ba6)
io.grpc:grpc-stub:1.80.0 (2 constraints: 591505d7)
io.grpc:grpc-util:1.80.0 (3 constraints: f7218364)
io.grpc:grpc-xds:1.80.0 (1 constraints: 1f100ba6)
io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
io.netty:netty-bom:4.2.6.Final (1 constraints: 2607ed5a)
io.netty:netty-buffer:4.2.6.Final (12 constraints: 93b4ecc9)
io.netty:netty-codec-base:4.2.6.Final (7 constraints: 8d5f3e44)
io.netty:netty-codec-compression:4.2.6.Final (2 constraints: 4a18b09e)
io.netty:netty-codec-http:4.2.6.Final (4 constraints: 7e2ec1d0)
io.netty:netty-codec-http2:4.2.6.Final (2 constraints: dd158907)
io.netty:netty-codec-http2:4.2.6.Final (2 constraints: e0150408)
io.netty:netty-codec-socks:4.2.6.Final (2 constraints: ac196ff4)
io.netty:netty-common:4.2.6.Final (14 constraints: 9fcdf69f)
io.netty:netty-handler:4.2.6.Final (5 constraints: db4410c9)
io.netty:netty-handler-proxy:4.2.6.Final (2 constraints: dd158907)
io.netty:netty-handler-proxy:4.2.6.Final (2 constraints: e0150408)
io.netty:netty-resolver:4.2.6.Final (3 constraints: ba2429ff)
io.netty:netty-tcnative-boringssl-static:2.0.73.Final (2 constraints: cf1ad957)
io.netty:netty-tcnative-classes:2.0.73.Final (2 constraints: d21e0195)
io.netty:netty-transport:4.2.6.Final (11 constraints: 16a7be79)
io.netty:netty-transport-classes-epoll:4.2.6.Final (2 constraints: 491d6c04)
io.netty:netty-transport-native-epoll:4.2.6.Final (2 constraints: d61a4e5f)
io.netty:netty-transport-native-unix-common:4.2.6.Final (5 constraints: a647dc44)
io.netty:netty-transport-native-unix-common:4.2.6.Final (5 constraints: a9470147)
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)
Expand All @@ -153,7 +153,7 @@ io.opentelemetry:opentelemetry-sdk-trace:1.53.0 (3 constraints: eb32b9b2)
io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd)
io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b)
io.perfmark:perfmark-api:0.27.0 (3 constraints: 22216516)
io.perfmark:perfmark-api:0.27.0 (3 constraints: 24218716)
io.prometheus:prometheus-metrics-exposition-formats:1.1.0 (1 constraints: 0405f335)
io.prometheus:prometheus-metrics-model:1.1.0 (2 constraints: 411b133b)
io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513)
Expand Down Expand Up @@ -267,7 +267,7 @@ org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36)
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.checkerframework:checker-qual:3.44.0 (5 constraints: 6c46e5ef)
org.checkerframework:checker-qual:3.44.0 (4 constraints: 223cdec5)
org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319)
org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a)
org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 38155daf)
Expand Down Expand Up @@ -316,7 +316,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0)
org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1)
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21)
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5)
org.jspecify:jspecify:1.0.0 (1 constraints: a909f5a9)
org.jspecify:jspecify:1.0.0 (2 constraints: bb130f8d)
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.20.0
dev.langchain4j:langchain4j-*=0.35.0
io.dropwizard.metrics:*=4.2.26
io.grpc:grpc-*=1.65.1
io.grpc:grpc-*=1.80.0
io.jaegertracing:*=1.8.1
io.netty:netty*=4.2.6.Final
io.netty:netty-tcnative*=2.0.73.Final
Expand Down
Loading