Skip to content

Commit 157fce7

Browse files
committed
SOLR-18206 Use google-cloud-bom instead of individual lib pinning (#4323)
(cherry picked from commit 20fe771)
1 parent c5b3366 commit 157fce7

101 files changed

Lines changed: 646 additions & 607 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/renovate.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"description": "Runs Renovate with solrbot, see dev-docs/dependency-upgrades.adoc for more",
44
"enabled": true,
5+
"gitIgnoredAuthors": ["renovate-bot <renovate-bot@noreply.github.com>"],
56
"dependencyDashboard": false,
67
"enabledManagers": ["gradle", "github-actions"],
78
"labels": ["exempt-stale"],
@@ -42,8 +43,14 @@
4243
"schedule": ["before 9am on the first day of the month"]
4344
},
4445
{
45-
"description": "Noisy, frequently updated dependencies checked less often",
46-
"matchPackagePrefixes": ["software.amazon.awssdk", "com.google.cloud"],
46+
"description": "AWS SDK packages checked less often",
47+
"matchPackagePrefixes": ["software.amazon.awssdk"],
48+
"groupName": "AWS SDK",
49+
"schedule": ["before 9am on the first day of the month"]
50+
},
51+
{
52+
"description": "Google Cloud BOM checked less often to avoid spam",
53+
"matchPackageNames": ["com.google.cloud:google-cloud-bom"],
4754
"schedule": ["before 9am on the first day of the month"]
4855
},
4956
{
@@ -94,7 +101,7 @@
94101
"groupName": "Admin UI libraries"
95102
}
96103
],
97-
"schedule": ["* * * * *"],
104+
"schedule": ["* * * * 0"],
98105
"prConcurrentLimit": 300,
99106
"prHourlyLimit": 20,
100107
"minimumReleaseAge": "5 days"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: Resolve Google cloud dependencies using google-cloud-bom. Bump it to 0.261.0 and grpc-bom to 1.80.0
2+
type: dependency_update
3+
authors:
4+
- name: solrbot
5+
- name: Jan Høydahl
6+
links:
7+
- name: PR#4323
8+
url: https://github.com/apache/solr/pull/4323

gradle/libs.versions.toml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,11 @@ fasterxml = "2.21.2"
8989
fasterxml-woodstox = "7.0.0"
9090
# @keep Flexmark used in classpath
9191
flexmark = "0.64.8"
92-
google-api-gax = "2.70.0"
9392
# @keep for version alignment
9493
google-api-grpc-proto = "2.61.1"
95-
google-auth = "1.19.0"
9694
# @keep for version alignment
9795
google-autovalue = "1.11.0"
98-
google-cloud-bom = "0.224.0"
99-
google-cloud-core = "2.60.1"
100-
google-cloud-nio = "0.127.3"
101-
google-cloud-storage = "2.27.0"
96+
google-cloud-bom = "0.261.0"
10297
google-errorprone = "2.41.0"
10398
# @keep for version alignment
10499
google-gson = "2.13.1"
@@ -111,7 +106,7 @@ google-javaformat = "1.18.1"
111106
google-protobuf = "3.25.8"
112107
# @keep Gradle version to run the build
113108
gradle = "8.10"
114-
grpc = "1.65.1"
109+
grpc = "1.80.0"
115110
# @keep Gulp version used in ref-guide
116111
gulp-cli = "3.1.0"
117112
hamcrest = "3.0"
@@ -353,18 +348,18 @@ flexmark-extensions-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext
353348
flexmark-extensions-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" }
354349
flexmark-extensions-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" }
355350
flexmark-flexmark = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" }
356-
google-api-gax = { module = "com.google.api:gax", version.ref = "google-api-gax" }
351+
google-api-gax = { module = "com.google.api:gax" }
357352
# @keep transitive dependency for version alignment
358353
google-api-grpc-proto = { module = "com.google.api.grpc:proto-google-common-protos", version.ref = "google-api-grpc-proto" }
359-
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "google-auth" }
360-
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "google-auth" }
354+
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials" }
355+
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http" }
361356
# @keep transitive dependency for version alignment
362357
google-autovalue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "google-autovalue" }
363358
google-cloud-bom = { module = "com.google.cloud:google-cloud-bom", version.ref = "google-cloud-bom" }
364-
google-cloud-core = { module = "com.google.cloud:google-cloud-core", version.ref = "google-cloud-core" }
365-
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http", version.ref = "google-cloud-core" }
366-
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio", version.ref = "google-cloud-nio" }
367-
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage", version.ref = "google-cloud-storage" }
359+
google-cloud-core = { module = "com.google.cloud:google-cloud-core" }
360+
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http" }
361+
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio" }
362+
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" }
368363
# @keep transitive dependency for version alignment
369364
google-errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "google-errorprone" }
370365
google-errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "google-errorprone" }

0 commit comments

Comments
 (0)