Skip to content

Commit db1b852

Browse files
authored
Upgrade Google Cloud libraries-bom to 26.83.0 (#38799)
* Upgrade Google Cloud libraries-bom to 26.83.0 * Add OpenTelemetry 1.57.0 license entries for BOM upgrade
1 parent 26b21e9 commit db1b852

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -609,14 +609,14 @@ class BeamModulePlugin implements Plugin<Project> {
609609
def dbcp2_version = "2.9.0"
610610
def errorprone_version = "2.31.0"
611611
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
612-
def gax_version = "2.79.0"
612+
def gax_version = "2.80.0"
613613
def google_ads_version = "33.0.0"
614614
def google_clients_version = "2.0.0"
615615
def google_cloud_bigdataoss_version = "3.1.16"
616616
def google_code_gson_version = "2.10.1"
617617
def google_oauth_clients_version = "1.34.1"
618618
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
619-
def grpc_version = "1.80.0"
619+
def grpc_version = "1.81.0"
620620
def guava_version = "33.1.0-jre"
621621
def hadoop_version = "3.4.2"
622622
def hamcrest_version = "2.1"
@@ -632,9 +632,9 @@ class BeamModulePlugin implements Plugin<Project> {
632632
def log4j2_version = "2.25.4"
633633
def nemo_version = "0.1"
634634
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
635-
def netty_version = "4.1.130.Final"
635+
def netty_version = "4.1.132.Final"
636636
// [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk, consistent with: google_cloud_platform_libraries_bom
637-
def opentelemetry_version = "1.56.0"
637+
def opentelemetry_version = "1.57.0"
638638
def opentelemetry_contrib_version = "1.52.0"
639639
def postgres_version = "42.6.2"
640640
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
@@ -761,14 +761,14 @@ class BeamModulePlugin implements Plugin<Project> {
761761
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
762762
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
763763
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
764-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.40.0", // [bomupgrader] sets version
764+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:3.0.0", // [bomupgrader] sets version
765765
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
766766
google_cloud_kms : "com.google.cloud:google-cloud-kms", // google_cloud_platform_libraries_bom sets version
767767
google_cloud_logging : "com.google.cloud:google-cloud-logging", // google_cloud_platform_libraries_bom sets version
768768
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
769769
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
770770
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
771-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.80.0",
771+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.83.0",
772772
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
773773
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
774774
google_cloud_storage : "com.google.cloud:google-cloud-storage", // google_cloud_platform_libraries_bom sets version

sdks/java/container/license_scripts/dep_urls_java.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jaxen:
4646
'1.1.6':
4747
type: "3-Clause BSD"
4848
libraries-bom:
49-
'26.80.0':
49+
'26.83.0':
5050
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
5151
type: "Apache License 2.0"
5252
paranamer:
@@ -69,10 +69,16 @@ opentelemetry-bom:
6969
'1.56.0':
7070
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.56.0/LICENSE"
7171
type: "Apache License 2.0"
72+
'1.57.0':
73+
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.57.0/LICENSE"
74+
type: "Apache License 2.0"
7275
opentelemetry-bom-alpha:
7376
'1.56.0-alpha':
7477
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.56.0/LICENSE"
7578
type: "Apache License 2.0"
79+
'1.57.0-alpha':
80+
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.57.0/LICENSE"
81+
type: "Apache License 2.0"
7682
zstd-jni:
7783
'1.5.2-5':
7884
license: "https://raw.githubusercontent.com/luben/zstd-jni/master/LICENSE"

0 commit comments

Comments
 (0)