Skip to content
Open
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
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
Copy link
Contributor

Choose a reason for hiding this comment

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

The bot ought to include the version here

Copy link
Contributor

Choose a reason for hiding this comment

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

Yea, it’s a weakness of renovate grouping. I’f what is grouped have different versions the pr title gets no version.

I’m hoping perhaps in future we only need to bump the bom with no grouping, and then it will say in title.

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.20.1"
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.256.0"
google-errorprone = "2.41.0"
# @keep for version alignment
google-gson = "2.13.1"
Expand Down Expand Up @@ -361,18 +356,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
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
340 changes: 170 additions & 170 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.57.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
218a30a106cb7d188ddf2d386d7fb50275f635bb
1 change: 1 addition & 0 deletions solr/licenses/checker-qual-3.49.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
54be36cb42c9b991c109e467e2bfa82af4cda44e
1 change: 1 addition & 0 deletions solr/licenses/error_prone_annotations-2.42.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
57a3eddaddd4f2d412e13d3bcefba29b5ebda1b6

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
72e20209470d0f1fc4ab15aafbc41835428f9f0a
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.74.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f8aad16910fabdcb8014a5feb15788970083c3e1
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.74.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0bdca5a3a76d35377a0ab718894f0ae6b23f9c56
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.74.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d96e94b2eab8250acb4062e763f6c08fd8d74e8

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6804c453d0386d40cd04ba68f289db7b1597e175
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.64.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee062028c10519e28eb799c4088a130297b7cd10
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.64.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0536215e919c713e327a2fa717f892c927bea8a4
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.64.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
23e34ffc137ac6f8bfacab55401d485392f05aa4
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.128.11.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
af137f95481130dc39d712ede478c8a39ddca5cb
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.62.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
81d3381b2cc332ebc431e936409586cbbc786d6a
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5be814ed9b23c52c1d689a79e820811b0684f9ae
1 change: 0 additions & 1 deletion solr/licenses/grpc-api-1.70.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-api-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1d8853ea2a5c1f68bf29c105ae8defb151dcd714
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
534130696c51d22c6288d5a5b894c1081edb1dd8
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84b120854fe6c46672a23d1468724b42822c2786
1 change: 1 addition & 0 deletions solr/licenses/grpc-core-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eb186a6a01323e560c9317b6226a61433bafadba

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/grpc-google-cloud-storage-v2-2.62.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3f4a4ac1fc1ed596a1eb78fffccb92c93631fb00
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1c053c3f16f6f6bf85f8c9ffa23e7d02b9b633e2
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbd28d63a51261397fd8858586e7cdf1f4fec436
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d19aaa202020d8ba39cd4b3f8c3f972002ce66b9
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eaa2570214d7f8945dce2519e57037590faf5ee2
1 change: 1 addition & 0 deletions solr/licenses/grpc-protobuf-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ad6200db8e463c608ef4e081c795efcec79734c5
1 change: 1 addition & 0 deletions solr/licenses/grpc-protobuf-lite-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f746d2bacf24791052fd1b477f1bcdfd2c25a9c9
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1eeb6c66128249c019a705ba0c181e11716c1f3a
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e1e9b5e7a8a1f3e9c09e1f7f9bf2eb3870fa85fb
1 change: 1 addition & 0 deletions solr/licenses/grpc-stub-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d8c4d0db4d0b2bc98954f87a787c205157247a4c
1 change: 1 addition & 0 deletions solr/licenses/grpc-util-1.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b6036f45e9c9e939414e11cd12723a1be1d8d3b1
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.76.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4992ea9b86cbb7dac7547b0bc254f271aa921265
1 change: 1 addition & 0 deletions solr/licenses/guava-33.5.0-jre.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8699de25f2f979108d6c1b804a7ba38cda1116bc
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
1 change: 1 addition & 0 deletions solr/licenses/opentelemetry-sdk-common-1.51.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b5038626586b5756d2a62a2e7307b2cca5386aad
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
676e3163b2773c9b315ff0075d88bcd31d1031d9
1 change: 1 addition & 0 deletions solr/licenses/opentelemetry-sdk-logs-1.51.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
33f962d29bb6eddf33005b169b0948cd785f82d6
1 change: 1 addition & 0 deletions solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
613d7f7743eb2b974680ad1af1685802e6a7cb58

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
451d677c1aae2887e2377d9f8b30cd36c3cd616c
1 change: 1 addition & 0 deletions solr/licenses/proto-google-common-protos-2.65.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cb31f36e1e5ca74fff3aa76c708027ae136c9486
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.60.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f4057c8c09e89872e0b5acec2ce31173230020a5
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
15 changes: 14 additions & 1 deletion solr/modules/gcs-repository/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ 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'
}
implementation libs.threeten.bp

testImplementation project(':solr:test-framework')
Expand All @@ -51,6 +58,12 @@ 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'
}
}

Loading
Loading