Skip to content

Commit 20fe771

Browse files
authored
SOLR-18206 Use google-cloud-bom instead of individual lib pinning (#4323)
1 parent e4ce737 commit 20fe771

101 files changed

Lines changed: 638 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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949
"schedule": ["before 9am on the first day of the month"]
5050
},
5151
{
52-
"description": "Google Cloud packages checked less often",
53-
"matchPackagePrefixes": ["com.google.cloud"],
54-
"groupName": "Google Cloud",
52+
"description": "Google Cloud BOM checked less often to avoid spam",
53+
"matchPackageNames": ["com.google.cloud:google-cloud-bom"],
5554
"schedule": ["before 9am on the first day of the month"]
5655
},
5756
{
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
@@ -92,16 +92,11 @@ fasterxml = "2.21.2"
9292
fasterxml-woodstox = "7.0.0"
9393
# @keep Flexmark used in classpath
9494
flexmark = "0.64.8"
95-
google-api-gax = "2.70.0"
9695
# @keep for version alignment
9796
google-api-grpc-proto = "2.61.1"
98-
google-auth = "1.19.0"
9997
# @keep for version alignment
10098
google-autovalue = "1.11.0"
101-
google-cloud-bom = "0.224.0"
102-
google-cloud-core = "2.60.1"
103-
google-cloud-nio = "0.127.3"
104-
google-cloud-storage = "2.27.0"
99+
google-cloud-bom = "0.261.0"
105100
google-errorprone = "2.41.0"
106101
# @keep for version alignment
107102
google-gson = "2.13.1"
@@ -114,7 +109,7 @@ google-javaformat = "1.18.1"
114109
google-protobuf = "3.25.8"
115110
# @keep Gradle version to run the build
116111
gradle = "8.10"
117-
grpc = "1.65.1"
112+
grpc = "1.80.0"
118113
# @keep Gulp version used in ref-guide
119114
gulp-cli = "3.1.0"
120115
hamcrest = "3.0"
@@ -370,18 +365,18 @@ flexmark-extensions-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext
370365
flexmark-extensions-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" }
371366
flexmark-extensions-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" }
372367
flexmark-flexmark = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" }
373-
google-api-gax = { module = "com.google.api:gax", version.ref = "google-api-gax" }
368+
google-api-gax = { module = "com.google.api:gax" }
374369
# @keep transitive dependency for version alignment
375370
google-api-grpc-proto = { module = "com.google.api.grpc:proto-google-common-protos", version.ref = "google-api-grpc-proto" }
376-
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "google-auth" }
377-
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "google-auth" }
371+
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials" }
372+
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http" }
378373
# @keep transitive dependency for version alignment
379374
google-autovalue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "google-autovalue" }
380375
google-cloud-bom = { module = "com.google.cloud:google-cloud-bom", version.ref = "google-cloud-bom" }
381-
google-cloud-core = { module = "com.google.cloud:google-cloud-core", version.ref = "google-cloud-core" }
382-
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http", version.ref = "google-cloud-core" }
383-
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio", version.ref = "google-cloud-nio" }
384-
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage", version.ref = "google-cloud-storage" }
376+
google-cloud-core = { module = "com.google.cloud:google-cloud-core" }
377+
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http" }
378+
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio" }
379+
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" }
385380
# @keep transitive dependency for version alignment
386381
google-errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "google-errorprone" }
387382
google-errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "google-errorprone" }

solr/core/gradle.lockfile

Lines changed: 176 additions & 176 deletions
Large diffs are not rendered by default.

solr/cross-dc-manager/gradle.lockfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarV
1919
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
2020
com.github.luben:zstd-jni:1.5.6-4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
2121
com.google.android:annotations:4.1.1.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
22-
com.google.api.grpc:proto-google-common-protos:2.61.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
22+
com.google.api.grpc:proto-google-common-protos:2.63.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
2323
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
2424
com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor
2525
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
@@ -60,14 +60,14 @@ io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClass
6060
io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath
6161
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
6262
io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
63-
io.grpc:grpc-api:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
64-
io.grpc:grpc-context:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
65-
io.grpc:grpc-core:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
66-
io.grpc:grpc-netty:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
67-
io.grpc:grpc-protobuf-lite:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
68-
io.grpc:grpc-protobuf:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
69-
io.grpc:grpc-stub:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
70-
io.grpc:grpc-util:1.65.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
63+
io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
64+
io.grpc:grpc-context:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
65+
io.grpc:grpc-core:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
66+
io.grpc:grpc-netty:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
67+
io.grpc:grpc-protobuf-lite:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
68+
io.grpc:grpc-protobuf:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
69+
io.grpc:grpc-stub:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
70+
io.grpc:grpc-util:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
7171
io.netty:netty-bom:4.2.12.Final=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
7272
io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
7373
io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath

solr/licenses/api-common-2.53.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8ffc3453842043f101a66a33b5f73260a040a8e5
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e4b613b411b934eee185aad72bee4c6148fb8dc3

solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
33db0af90782c6a2b01d9860b1379882609b7c15

0 commit comments

Comments
 (0)