Skip to content
Closed
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
5 changes: 2 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@
"schedule": ["before 9am on the first day of the month"]
},
{
"description": "Google Cloud packages checked less often",
"matchPackagePrefixes": ["com.google.cloud"],
"groupName": "Google Cloud",
"description": "Google Cloud BOM checked less often to avoid spam",
"matchPackageNames": ["com.google.cloud:google-cloud-bom"],
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.

Removing renovatebot group rule, trying to just keep the custom schedule since it is updated almost every single day...

"schedule": ["before 9am on the first day of the month"]
},
{
Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/PR#4098-update-google-cloud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Update Google Cloud
type: dependency_update
authors:
- name: solrbot
links:
- name: PR#4098
url: https://github.com/apache/solr/pull/4098
21 changes: 8 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,11 @@ fasterxml = "2.21.2"
fasterxml-woodstox = "7.0.0"
# @keep Flexmark used in classpath
flexmark = "0.64.8"
google-api-gax = "2.70.0"
# @keep for version alignment
google-api-grpc-proto = "2.61.1"
google-auth = "1.19.0"
# @keep for version alignment
google-autovalue = "1.11.0"
google-cloud-bom = "0.224.0"
google-cloud-core = "2.60.1"
google-cloud-nio = "0.127.3"
google-cloud-storage = "2.27.0"
google-cloud-bom = "0.261.0"
google-errorprone = "2.41.0"
# @keep for version alignment
google-gson = "2.13.1"
Expand Down Expand Up @@ -360,18 +355,18 @@ flexmark-extensions-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext
flexmark-extensions-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" }
flexmark-extensions-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" }
flexmark-flexmark = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" }
google-api-gax = { module = "com.google.api:gax", version.ref = "google-api-gax" }
google-api-gax = { module = "com.google.api:gax" }
# @keep transitive dependency for version alignment
google-api-grpc-proto = { module = "com.google.api.grpc:proto-google-common-protos", version.ref = "google-api-grpc-proto" }
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "google-auth" }
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "google-auth" }
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials" }
google-auth-oauth2http = { module = "com.google.auth:google-auth-library-oauth2-http" }
# @keep transitive dependency for version alignment
google-autovalue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "google-autovalue" }
google-cloud-bom = { module = "com.google.cloud:google-cloud-bom", version.ref = "google-cloud-bom" }
google-cloud-core = { module = "com.google.cloud:google-cloud-core", version.ref = "google-cloud-core" }
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http", version.ref = "google-cloud-core" }
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio", version.ref = "google-cloud-nio" }
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage", version.ref = "google-cloud-storage" }
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.

I was able to remove version ref (and also version declaration above) for seven libs covered by this BOM. It all seems to compile.

google-cloud-core = { module = "com.google.cloud:google-cloud-core" }
google-cloud-corehttp = { module = "com.google.cloud:google-cloud-core-http" }
google-cloud-nio = { module = "com.google.cloud:google-cloud-nio" }
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" }
# @keep transitive dependency for version alignment
google-errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "google-errorprone" }
google-errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "google-errorprone" }
Expand Down
1 change: 1 addition & 0 deletions gradle/validation/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ allprojects {
conf.shouldResolveConsistentlyWith(project.configurations.runtimeClasspath)
}


dependencies {
modules {
module("org.hamcrest:hamcrest-core") {
Expand Down
352 changes: 176 additions & 176 deletions solr/core/gradle.lockfile

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion solr/licenses/api-common-2.53.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/api-common-2.62.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ffc3453842043f101a66a33b5f73260a040a8e5
1 change: 1 addition & 0 deletions solr/licenses/error_prone_annotations-2.45.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e4b613b411b934eee185aad72bee4c6148fb8dc3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
33db0af90782c6a2b01d9860b1379882609b7c15
1 change: 0 additions & 1 deletion solr/licenses/gax-2.70.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/gax-2.79.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ae533be5c421a718e73fa5a7f04909f8036ac729
1 change: 0 additions & 1 deletion solr/licenses/gax-grpc-2.50.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/gax-grpc-2.79.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db8d11f82f93b8c4f82e22dbd933ee0e7e4dd9a2
1 change: 0 additions & 1 deletion solr/licenses/gax-httpjson-2.70.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/gax-httpjson-2.79.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1f9dc4e9904a9d5dbe68898459ac7c88c752e176

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
44f5c332e039669200fabd453eb6b95f43da4877

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4a034dd289c23fd37fa337f40e2617fc902669b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
afaa62d0ad2c6ba82c0dae4f2b791b0d43e2db51
1 change: 0 additions & 1 deletion solr/licenses/google-cloud-core-2.60.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-cloud-core-2.69.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c5f0fdb6d37799f8b7c06c471cba0a19f879ee43
1 change: 0 additions & 1 deletion solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-cloud-core-grpc-2.69.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
df6ae6b2d7ed454184ce396b8833f51d938291c5
1 change: 0 additions & 1 deletion solr/licenses/google-cloud-core-http-2.60.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-cloud-core-http-2.69.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ab3bd00d004fe95ef5179941f5cbaa8bd2be7589
1 change: 0 additions & 1 deletion solr/licenses/google-cloud-nio-0.127.20.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-cloud-nio-0.131.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8647a2fbc974f9c5252c601b55e72869fd19de16
1 change: 0 additions & 1 deletion solr/licenses/google-cloud-storage-2.40.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-cloud-storage-2.67.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1a61d4d039d9a567840a8692b521a17eb134eb2
1 change: 0 additions & 1 deletion solr/licenses/google-http-client-1.47.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-http-client-2.1.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f4c08fa160a5199af19f81080fbaa921ae2193c7
1 change: 0 additions & 1 deletion solr/licenses/google-http-client-apache-v2-1.45.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0e1af7948c8505b26f17cad54a61a43d6fa45686
1 change: 0 additions & 1 deletion solr/licenses/google-http-client-appengine-1.47.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-http-client-appengine-2.1.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9df9de27b31fca53b0126ed635f3e71018cdc3d1
1 change: 0 additions & 1 deletion solr/licenses/google-http-client-gson-1.47.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-http-client-gson-2.1.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e65ea98fe4e8d3a512559698a0d8664908fd36f3
1 change: 0 additions & 1 deletion solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4c10b1a877369a60e81d325c2aed72a459c2c29
1 change: 0 additions & 1 deletion solr/licenses/google-oauth-client-1.36.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/google-oauth-client-1.39.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
99f02f3c46c68c01dfc95878456b009a13229c88
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: 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.70.0.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: 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

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-google-cloud-storage-v2-2.67.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ac86cc5b2a265240eb4517b659a38dc1e132dcea
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-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: 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: 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: 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: 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/opencensus-proto-0.2.0.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e2e4f1932bdc40aa9f38d746652712152e3f3fa1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82ebe8bd776dae2bcc289ba4bfe32b58863eca2f
1 change: 1 addition & 0 deletions solr/licenses/proto-google-common-protos-2.70.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2c7c018541be96f9efd876c3aa441e1a1d0afcd4
1 change: 0 additions & 1 deletion solr/licenses/proto-google-iam-v1-1.56.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/proto-google-iam-v1-1.65.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
92e53aa0df6844146a76cbd166d2461b2a272dbe
1 change: 1 addition & 0 deletions solr/licenses/protobuf-java-4.33.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c85bf5de1ad10453792675f6515401f7b8eb6860
1 change: 1 addition & 0 deletions solr/licenses/protobuf-java-util-4.33.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c40e96546f9152b213b128798a7e5df7568b66b
1 change: 0 additions & 1 deletion solr/licenses/re2j-1.7.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/re2j-1.8.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12c25e923e9e4fb1575a7640a2698745c6f19a94
19 changes: 18 additions & 1 deletion solr/modules/gcs-repository/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,16 @@ dependencies {
implementation libs.google.auth.credentials
implementation libs.google.cloud.core
implementation libs.google.cloud.corehttp
implementation libs.google.cloud.storage
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'
exclude group: 'io.opentelemetry'
exclude group: 'io.opentelemetry.semconv'
}
Comment thread
janhoy marked this conversation as resolved.
implementation libs.threeten.bp

testImplementation project(':solr:test-framework')
Expand All @@ -51,6 +60,14 @@ dependencies {

testImplementation(libs.google.cloud.nio) {
exclude group: 'javax.inject'
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'
exclude group: 'io.opentelemetry'
exclude group: 'io.opentelemetry.semconv'
}
}

Loading
Loading