Skip to content

SOLR-18206 Use google-cloud-bom instead of individual lib pinning#4323

Merged
janhoy merged 13 commits into
apache:mainfrom
janhoy:SOLR-18206-use-google-cloud-bom
May 13, 2026
Merged

SOLR-18206 Use google-cloud-bom instead of individual lib pinning#4323
janhoy merged 13 commits into
apache:mainfrom
janhoy:SOLR-18206-use-google-cloud-bom

Conversation

@janhoy

@janhoy janhoy commented Apr 23, 2026

Copy link
Copy Markdown
Contributor

https://issues.apache.org/jira/browse/SOLR-18206

This PR supersedes #4098 (originally opened by Renovate/SolrBot) and expands its scope significantly.

Instead of just bumping individual Google Cloud library versions, this PR switches the GCS repository module to resolve all Google Cloud dependencies via the google-cloud-bom Bill of Materials, then bumps the BOM to the latest version (0.261.0). This simplifies future upgrades — only the BOM version needs updating, and all transitive Google Cloud
libraries are automatically aligned.

Changes

  • google-cloud-bom bumped from 0.224.00.261.0
  • grpc-bom bumped from 1.65.11.80.0
  • Removed explicit version pins for Google Cloud libraries now managed by the BOM (google-cloud-storage, google-cloud-nio, google-cloud-core, google-cloud-core-http, google-auth, google-api-gax)
  • Excluded unnecessary Google OTel transitive dependencies pulled in by the GCS module
  • Added consistentResolution.useCompileClasspathVersions() to the GCS module to align dependency resolution across configurations
  • Updated all lockfiles and license SHA1 files accordingly

Key transitive version changes (via BOM 0.261.0)

Library Before After
google-cloud-storage 2.27.0 2.67.0
google-cloud-nio 0.127.3 0.131.0
google-cloud-core 2.60.1 2.69.0
google-auth 1.19.0 1.46.0
gax 2.70.x 2.79.0
grpc-* 1.65.1 1.80.0

Closes #3117

@janhoy janhoy requested review from Copilot and removed request for Copilot April 23, 2026 08:04

This comment was marked as resolved.

@janhoy janhoy requested a review from dsmiley April 23, 2026 08:19
Comment thread changelog/unreleased/PR#4323-use-google-cloud-bom.yml Outdated
Comment thread gradle/libs.versions.toml
# @keep transitive dependency for version alignment
grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" }
grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We should probably try the same trick (removing version.ref) for the grpc-* family as well, although they use a common version.

@janhoy

janhoy commented Apr 23, 2026

Copy link
Copy Markdown
Contributor Author

Crave tests failed with

Selecting project Solr (id:39)
Picking up local changes (if any)...
Waiting for build id:269589 to start...
Setting up workspace (this could take some time)...
CreateImageFromSnapshotFailed Exception({'errors': [{'code': 'QUOTA_EXCEEDED', 'message': "Quota 'SSD_TOTAL_GB' exceeded.  Limit: 20480.0 in region us-central1.", 'errorDetails': [{'quotaInfo': {'metricName': 'compute.googleapis.com/ssd_total_storage', 'limitName': 'SSD-TOTAL-GB-per-project-region', 'dimensions': {'region': 'us-central1'}, 'limit': 20480}}]}]}) 

Have anyone seen it before? Could it be the build cancellations in #4318 that is not working as it should and leaves behind old workspaces? Who has the foo to clean up?

@janhoy

janhoy commented May 10, 2026

Copy link
Copy Markdown
Contributor Author

There was some review and discussion on the original #4098 PR. Anything more to add?

I intend to merge this to main and 10_x on Wednesday.

@malliaridis malliaridis left a comment

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.

LGTM.

Only one note for 10.x, there are 1-2 dependencies with major upgrade (google-http-client* from 1.x to 2.x). If that is fine for 10.x, feel free to proceed with the backport. :)

@janhoy janhoy merged commit 20fe771 into apache:main May 13, 2026
4 of 6 checks passed
@janhoy janhoy deleted the SOLR-18206-use-google-cloud-bom branch May 13, 2026 10:23
janhoy added a commit that referenced this pull request May 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants