Skip to content

Commit dbf4e5a

Browse files
authored
Update BOM to 26.72.0 (#36919)
* Upgrade bom. * Test fix. * License. * License.
1 parent 43fdd50 commit dbf4e5a

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

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

Lines changed: 7 additions & 7 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.71.0"
611+
def gax_version = "2.72.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"
@@ -617,7 +617,7 @@ class BeamModulePlugin implements Plugin<Project> {
617617
def google_code_gson_version = "2.10.1"
618618
def google_oauth_clients_version = "1.34.1"
619619
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
620-
def grpc_version = "1.71.0"
620+
def grpc_version = "1.76.0"
621621
def guava_version = "33.1.0-jre"
622622
def hadoop_version = "3.4.2"
623623
def hamcrest_version = "2.1"
@@ -633,9 +633,9 @@ class BeamModulePlugin implements Plugin<Project> {
633633
def log4j2_version = "2.20.0"
634634
def nemo_version = "0.1"
635635
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
636-
def netty_version = "4.1.110.Final"
636+
def netty_version = "4.1.124.Final"
637637
// [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk, consistent with: google_cloud_platform_libraries_bom
638-
def opentelemetry_version = "1.47.0"
638+
def opentelemetry_version = "1.52.0"
639639
def postgres_version = "42.2.16"
640640
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
641641
def protobuf_version = "4.33.0"
@@ -736,7 +736,7 @@ class BeamModulePlugin implements Plugin<Project> {
736736
google_api_client_gson : "com.google.api-client:google-api-client-gson:$google_clients_version",
737737
google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_version",
738738
google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version
739-
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20250706-2.0.0", // [bomupgrader] sets version
739+
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20251012-2.0.0", // [bomupgrader] sets version
740740
google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-2.0.0", // [bomupgrader] sets version
741741
google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20250519-$google_clients_version",
742742
google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_clients_version",
@@ -753,13 +753,13 @@ class BeamModulePlugin implements Plugin<Project> {
753753
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
754754
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
755755
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
756-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.32.3", // [bomupgrader] sets version
756+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.33.0", // [bomupgrader] sets version
757757
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
758758
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
759759
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
760760
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
761761
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
762-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.71.0",
762+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.72.0",
763763
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
764764
// TODO(#35868) remove pinned google_cloud_spanner_bom after tests or upstream fixed
765765
google_cloud_spanner_bom : "com.google.cloud:google-cloud-spanner-bom:$google_cloud_spanner_version",

sdks/java/container/license_scripts/dep_urls_java.yaml

Lines changed: 5 additions & 5 deletions
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.71.0':
49+
'26.72.0':
5050
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
5151
type: "Apache License 2.0"
5252
paranamer:
@@ -66,12 +66,12 @@ org.eclipse.jgit:
6666
license: "https://www.eclipse.org/org/documents/edl-v10.html"
6767
type: "Eclipse Distribution License - v1.0"
6868
opentelemetry-bom:
69-
'1.47.0':
70-
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.47.0/LICENSE"
69+
'1.52.0':
70+
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.52.0/LICENSE"
7171
type: "Apache License 2.0"
7272
opentelemetry-bom-alpha:
73-
'1.47.0-alpha':
74-
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.47.0/LICENSE"
73+
'1.52.0-alpha':
74+
license: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-java/v1.52.0/LICENSE"
7575
type: "Apache License 2.0"
7676
zstd-jni:
7777
'1.5.2-5':

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/testing/FakeDatasetService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,7 @@ public Table getTableImpl(
261261
Map<String, TableContainer> dataset =
262262
tables.get(tableRef.getProjectId(), tableRef.getDatasetId());
263263
if (dataset == null) {
264-
throwNotFound(
265-
"Tried to get a dataset %s:%s, but no such dataset was set",
266-
tableRef.getProjectId(), tableRef.getDatasetId());
264+
return null;
267265
}
268266
TableContainer tableContainer = dataset.get(tableRef.getTableId());
269267

0 commit comments

Comments
 (0)