Skip to content

Commit f2765ca

Browse files
authored
Fix bom upgrader and upgrade to latest (#37636)
* Fix bom upgrader and upgrade to latest * Pin bt
1 parent 30bdbaf commit f2765ca

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ class BeamModulePlugin implements Plugin<Project> {
608608
def dbcp2_version = "2.9.0"
609609
def errorprone_version = "2.31.0"
610610
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
611-
def gax_version = "2.74.0"
611+
def gax_version = "2.74.1"
612612
def google_ads_version = "33.0.0"
613613
def google_clients_version = "2.0.0"
614614
def google_cloud_bigdataoss_version = "2.2.26"
@@ -637,6 +637,8 @@ class BeamModulePlugin implements Plugin<Project> {
637637
def postgres_version = "42.2.16"
638638
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
639639
def protobuf_version = "4.33.2"
640+
// TODO(https://github.com/apache/beam/issues/37637): Remove this once the Bom has been updated to at least reach this version
641+
def bigtable_version = "2.73.1"
640642
def qpid_jms_client_version = "0.61.0"
641643
def quickcheck_version = "1.0"
642644
def sbe_tool_version = "1.25.1"
@@ -745,20 +747,20 @@ class BeamModulePlugin implements Plugin<Project> {
745747
google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version
746748
google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version
747749
google_cloud_bigquery_storage : "com.google.cloud:google-cloud-bigquerystorage", // google_cloud_platform_libraries_bom sets version
748-
google_cloud_bigtable : "com.google.cloud:google-cloud-bigtable", // google_cloud_platform_libraries_bom sets version
750+
google_cloud_bigtable : "com.google.cloud:google-cloud-bigtable:$bigtable_version", // google_cloud_platform_libraries_bom sets version
749751
google_cloud_bigtable_client_core_config : "com.google.cloud.bigtable:bigtable-client-core-config:1.28.0",
750752
google_cloud_bigtable_emulator : "com.google.cloud:google-cloud-bigtable-emulator", // google_cloud_platform_libraries_bom sets version
751753
google_cloud_core : "com.google.cloud:google-cloud-core", // google_cloud_platform_libraries_bom sets version
752754
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
753755
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
754756
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
755-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.33.3", // [bomupgrader] sets version
757+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.34.0", // [bomupgrader] sets version
756758
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
757759
google_cloud_kms : "com.google.cloud:google-cloud-kms", // google_cloud_platform_libraries_bom sets version
758760
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
759761
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
760762
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
761-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.75.0",
763+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.76.0",
762764
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
763765
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
764766
google_cloud_storage : "com.google.cloud:google-cloud-storage", // google_cloud_platform_libraries_bom sets version

scripts/tools/bomupgrader.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class BeamModulePluginProcessor:
4848
KNOWN_DEPS = {
4949
"arrow": "org.apache.arrow:arrow-memory-core",
5050
"gax": "com.google.api:gax",
51-
"google_cloud_spanner": "com.google.cloud:google-cloud-spanner",
5251
"grpc":
5352
"io.grpc:grpc-netty", # use "grpc-netty" to pick up proper netty version
5453
"netty": "io.netty:netty-transport",

sdks/java/container/license_scripts/dep_urls_java.yaml

Lines changed: 1 addition & 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.75.0':
49+
'26.76.0':
5050
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
5151
type: "Apache License 2.0"
5252
paranamer:

0 commit comments

Comments
 (0)