Open
Conversation
github-actions
bot
added
dependencies
solrbot
force-pushed
the
renovate/google-cloud
branch
20 times, most recently
from
8feaa47 to
6c869d1
Compare
solrbot
force-pushed
the
renovate/google-cloud
branch
from
8e34bdb to
6514255
Compare
github-actions
bot
added
documentation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates Solr’s Google Cloud (GCS) dependency set and associated lockfiles/licenses to newer versions, with small test/support adjustments to accommodate the newer Storage API surface and transitive dependency graph.
Changes:
- Bump Google Cloud BOM/Core/Storage/NIO versions in the version catalog and regenerate Gradle lockfiles.
- Update the GCS repository module’s dependency wiring (exclusions) and adjust test wrapper to implement the newer
Storageinterface (moveBlob). - Refresh
solr/licenses/*.sha1entries to match the new resolved dependency set.
Reviewed changes
Copilot reviewed 94 out of 94 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| solr/test-framework/gradle.lockfile | Regenerated locks (adds *ClasspathCopy configs). |
| solr/solrj-zookeeper/gradle.lockfile | Regenerated locks (adds *ClasspathCopy configs). |
| solr/solr-ref-guide/gradle.lockfile | Regenerated locks (updates empty= scopes). |
| solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java | Adds moveBlob delegation to satisfy updated Storage API. |
| solr/modules/gcs-repository/gradle.lockfile | Updates resolved Google Cloud + transitive deps (gRPC/protobuf/etc). |
| solr/modules/gcs-repository/build.gradle | Adds excludes for newly introduced transitive monitoring/otel deps. |
| solr/core/gradle.lockfile | Regenerated locks (adds *ClasspathCopy configs). |
| gradle/libs.versions.toml | Bumps Google Cloud versions (BOM/Core/NIO/Storage). |
| changelog/unreleased/PR#4098-update-google-cloud.yml | Adds changelog entry for dependency update. |
| solr/licenses/re2j-1.8.jar.sha1 | Adds SHA1 for updated re2j. |
| solr/licenses/re2j-1.7.jar.sha1 | Removes SHA1 for previous re2j. |
| solr/licenses/protobuf-java-util-4.33.2.jar.sha1 | Adds SHA1 for updated protobuf-java-util. |
| solr/licenses/protobuf-java-4.33.2.jar.sha1 | Adds SHA1 for updated protobuf-java. |
| solr/licenses/proto-google-iam-v1-1.60.0.jar.sha1 | Adds SHA1 for updated proto-google-iam-v1. |
| solr/licenses/proto-google-iam-v1-1.56.1.jar.sha1 | Removes SHA1 for previous proto-google-iam-v1. |
| solr/licenses/proto-google-common-protos-2.65.0.jar.sha1 | Adds SHA1 for updated proto-google-common-protos. |
| solr/licenses/proto-google-cloud-storage-v2-2.62.1.jar.sha1 | Adds SHA1 for updated proto-google-cloud-storage-v2. |
| solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 | Removes SHA1 for previous proto-google-cloud-storage-v2. |
| solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 | Adds SHA1 for newly introduced OTel semconv artifact. |
| solr/licenses/opentelemetry-sdk-logs-1.51.0.jar.sha1 | Adds SHA1 for newly introduced OTel SDK logs artifact. |
| solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.51.0.jar.sha1 | Adds SHA1 for newly introduced OTel autoconfigure SPI artifact. |
| solr/licenses/opentelemetry-sdk-common-1.51.0.jar.sha1 | Adds SHA1 for newly introduced OTel SDK common artifact. |
| solr/licenses/opentelemetry-gcp-resources-1.37.0-alpha.jar.sha1 | Adds SHA1 for newly introduced OTel GCP resources artifact. |
| solr/licenses/opencensus-proto-0.2.0.jar.sha1 | Removes SHA1 for previous opencensus-proto. |
| solr/licenses/guava-33.5.0-jre.jar.sha1 | Adds SHA1 for updated guava. |
| solr/licenses/grpc-xds-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-xds. |
| solr/licenses/grpc-xds-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-xds. |
| solr/licenses/grpc-util-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-util. |
| solr/licenses/grpc-stub-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-stub. |
| solr/licenses/grpc-services-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-services. |
| solr/licenses/grpc-services-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-services. |
| solr/licenses/grpc-rls-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-rls. |
| solr/licenses/grpc-rls-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-rls. |
| solr/licenses/grpc-protobuf-lite-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-protobuf-lite. |
| solr/licenses/grpc-protobuf-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-protobuf. |
| solr/licenses/grpc-netty-shaded-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-netty-shaded. |
| solr/licenses/grpc-netty-shaded-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-netty-shaded. |
| solr/licenses/grpc-inprocess-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-inprocess. |
| solr/licenses/grpc-inprocess-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-inprocess. |
| solr/licenses/grpc-grpclb-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-grpclb. |
| solr/licenses/grpc-grpclb-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-grpclb. |
| solr/licenses/grpc-googleapis-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-googleapis. |
| solr/licenses/grpc-googleapis-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-googleapis. |
| solr/licenses/grpc-google-cloud-storage-v2-2.62.1.jar.sha1 | Adds SHA1 for updated grpc-google-cloud-storage-v2. |
| solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 | Removes SHA1 for previous grpc-google-cloud-storage-v2. |
| solr/licenses/grpc-core-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-core. |
| solr/licenses/grpc-context-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-context. |
| solr/licenses/grpc-context-1.70.0.jar.sha1 | Removes SHA1 for previous grpc-context. |
| solr/licenses/grpc-auth-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-auth. |
| solr/licenses/grpc-auth-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-auth. |
| solr/licenses/grpc-api-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-api. |
| solr/licenses/grpc-api-1.70.0.jar.sha1 | Removes SHA1 for previous grpc-api. |
| solr/licenses/grpc-alts-1.76.2.jar.sha1 | Adds SHA1 for updated grpc-alts. |
| solr/licenses/grpc-alts-1.65.1.jar.sha1 | Removes SHA1 for previous grpc-alts. |
| solr/licenses/google-oauth-client-1.39.0.jar.sha1 | Adds SHA1 for updated google-oauth-client. |
| solr/licenses/google-oauth-client-1.36.0.jar.sha1 | Removes SHA1 for previous google-oauth-client. |
| solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1 | Adds SHA1 for updated google-http-client-jackson2. |
| solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 | Removes SHA1 for previous google-http-client-jackson2. |
| solr/licenses/google-http-client-gson-2.1.0.jar.sha1 | Adds SHA1 for updated google-http-client-gson. |
| solr/licenses/google-http-client-gson-1.47.1.jar.sha1 | Removes SHA1 for previous google-http-client-gson. |
| solr/licenses/google-http-client-appengine-2.1.0.jar.sha1 | Adds SHA1 for updated google-http-client-appengine. |
| solr/licenses/google-http-client-appengine-1.47.1.jar.sha1 | Removes SHA1 for previous google-http-client-appengine. |
| solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1 | Adds SHA1 for updated google-http-client-apache-v2. |
| solr/licenses/google-http-client-apache-v2-1.45.2.jar.sha1 | Removes SHA1 for previous google-http-client-apache-v2. |
| solr/licenses/google-http-client-2.1.0.jar.sha1 | Adds SHA1 for updated google-http-client. |
| solr/licenses/google-http-client-1.47.1.jar.sha1 | Removes SHA1 for previous google-http-client. |
| solr/licenses/google-cloud-storage-2.62.1.jar.sha1 | Adds SHA1 for updated google-cloud-storage. |
| solr/licenses/google-cloud-storage-2.40.1.jar.sha1 | Removes SHA1 for previous google-cloud-storage. |
| solr/licenses/google-cloud-nio-0.128.11.jar.sha1 | Adds SHA1 for updated google-cloud-nio. |
| solr/licenses/google-cloud-nio-0.127.20.jar.sha1 | Removes SHA1 for previous google-cloud-nio. |
| solr/licenses/google-cloud-core-http-2.64.0.jar.sha1 | Adds SHA1 for updated google-cloud-core-http. |
| solr/licenses/google-cloud-core-http-2.60.1.jar.sha1 | Removes SHA1 for previous google-cloud-core-http. |
| solr/licenses/google-cloud-core-grpc-2.64.0.jar.sha1 | Adds SHA1 for updated google-cloud-core-grpc. |
| solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 | Removes SHA1 for previous google-cloud-core-grpc. |
| solr/licenses/google-cloud-core-2.64.0.jar.sha1 | Adds SHA1 for updated google-cloud-core. |
| solr/licenses/google-cloud-core-2.60.1.jar.sha1 | Removes SHA1 for previous google-cloud-core. |
| solr/licenses/google-auth-library-oauth2-http-1.42.1.jar.sha1 | Adds SHA1 for updated google-auth-library-oauth2-http. |
| solr/licenses/google-auth-library-oauth2-http-1.39.0.jar.sha1 | Removes SHA1 for previous google-auth-library-oauth2-http. |
| solr/licenses/google-auth-library-credentials-1.42.1.jar.sha1 | Adds SHA1 for updated google-auth-library-credentials. |
| solr/licenses/google-auth-library-credentials-1.39.0.jar.sha1 | Removes SHA1 for previous google-auth-library-credentials. |
| solr/licenses/google-api-services-storage-v1-rev20251118-2.0.0.jar.sha1 | Adds SHA1 for updated google-api-services-storage. |
| solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 | Removes SHA1 for previous google-api-services-storage. |
| solr/licenses/gax-httpjson-2.74.0.jar.sha1 | Adds SHA1 for updated gax-httpjson. |
| solr/licenses/gax-httpjson-2.70.1.jar.sha1 | Removes SHA1 for previous gax-httpjson. |
| solr/licenses/gax-grpc-2.74.0.jar.sha1 | Adds SHA1 for updated gax-grpc. |
| solr/licenses/gax-grpc-2.50.0.jar.sha1 | Removes SHA1 for previous gax-grpc. |
| solr/licenses/gax-2.74.0.jar.sha1 | Adds SHA1 for updated gax. |
| solr/licenses/gax-2.70.1.jar.sha1 | Removes SHA1 for previous gax. |
| solr/licenses/gapic-google-cloud-storage-v2-2.62.1.jar.sha1 | Adds SHA1 for updated gapic-google-cloud-storage-v2. |
| solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 | Removes SHA1 for previous gapic-google-cloud-storage-v2. |
| solr/licenses/error_prone_annotations-2.42.0.jar.sha1 | Adds SHA1 for newly resolved error_prone_annotations version. |
| solr/licenses/checker-qual-3.49.0.jar.sha1 | Adds SHA1 for updated checker-qual. |
| solr/licenses/api-common-2.57.0.jar.sha1 | Adds SHA1 for updated api-common. |
| solr/licenses/api-common-2.53.1.jar.sha1 | Removes SHA1 for previous api-common. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+76
to
+80
| io.grpc:grpc-alts:1.76.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-api:1.76.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-auth:1.76.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-bom:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-context:1.70.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-core:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-googleapis:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-grpclb:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-inprocess:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-netty-shaded:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-protobuf-lite:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-protobuf:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-rls:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-services:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-stub:1.65.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath | ||
| io.grpc:grpc-util:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-xds:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath | ||
| io.grpc:grpc-context:1.76.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath |
There was a problem hiding this comment.
The resolved gRPC artifacts in this lockfile are 1.76.2, but the module still locks io.grpc:grpc-bom at 1.65.1. This defeats BOM-based alignment and can leave you with an internally inconsistent gRPC set if any dependency relies on the BOM’s constraints. Consider bumping the gRPC BOM/version catalog entry to match the resolved gRPC version (or enforcing a single version via an enforced platform) so all io.grpc:* artifacts are aligned.
Contributor
There was a problem hiding this comment.
Hmm, probably need to bump the bom yea.
Wonder how renovatebot would be able to figure out this by itself though?
Comment on lines
+44
to
+51
| implementation(libs.google.cloud.storage) { | ||
| exclude group: 'io.grpc', module: 'grpc-opentelemetry' | ||
| exclude group: 'com.google.cloud.opentelemetry', module: 'exporter-metrics' | ||
| exclude group: 'com.google.cloud', module: 'google-cloud-monitoring' | ||
| exclude group: 'com.google.api.grpc', module: 'proto-google-cloud-monitoring-v3' | ||
| exclude group: 'com.google.cloud.opentelemetry', module: 'shared-resourcemapping' | ||
| exclude group: 'com.google.cloud.opentelemetry', module: 'detector-resources-support' | ||
| } |
There was a problem hiding this comment.
The same set of transitive excludes is duplicated for both libs.google.cloud.storage and libs.google.cloud.nio. To reduce the chance they drift over time (and to make future dependency bumps easier), consider extracting these excludes into a shared helper/closure or applying them once at the configuration level for this module.
Contributor
|
@dsmiley Are you able to review this dependency upgrade? Here's why
|
Collaborator
Author
Edited/Blocked NotificationRenovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR. You can manually request rebase by checking the rebase/retry box above. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
2.27.0->2.62.10.127.3->0.128.112.60.1->2.64.02.60.1->2.64.00.224.0->0.255.00.256.0Release Notes
googleapis/java-storage (com.google.cloud:google-cloud-storage)
v2.62.1Bug Fixes
Dependencies
v2.62.0Features
Bug Fixes
Dependencies
v2.61.0Features
Bug Fixes
Dependencies
v2.60.0Features
Bug Fixes
Dependencies
v2.59.0Features
Bug Fixes
Dependencies
v2.58.1Bug Fixes
Dependencies
v2.58.0Features
Bug Fixes
Dependencies
v2.57.0Features
Bug Fixes
Dependencies
v2.56.0Features
Bug Fixes
Dependencies
v2.55.0Features
Bug Fixes
Dependencies
v2.54.0Features
Bug Fixes
Dependencies
v2.53.3Bug Fixes
Dependencies
v2.53.2Bug Fixes
Dependencies
v2.53.1Bug Fixes
Dependencies
v2.53.0Features
Bug Fixes
Dependencies
Documentation
v2.52.3Bug Fixes
Dependencies
v2.52.2Bug Fixes
Dependencies
v2.52.1Bug Fixes
v2.52.0Features
Bug Fixes
Dependencies
v2.51.0Features
Bug Fixes
Dependencies
v2.50.0Features
Bug Fixes
Dependencies
v2.49.0Features
Bug Fixes
Dependencies
Documentation
v2.48.2Dependencies
Documentation
v2.48.1Bug Fixes
Dependencies
Documentation
v2.48.0Features
Bug Fixes
Dependencies
v2.47.0Features
Bug Fixes
Dependencies
v2.46.0Features
java.timemethods and variables (#2826) (baf30ee)Bug Fixes
Dependencies
Documentation
v2.45.0Features
Bug Fixes
Dependencies
v2.44.1Dependencies
v2.44.0Features
Bug Fixes
Dependencies
v2.43.2Bug Fixes
Dependencies
v2.43.1Bug Fixes
Configuration
📅 Schedule: Branch creation - "before 9am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.
This PR has been generated by Renovate Bot