Skip to content

Commit 04ce0b6

Browse files
Amar3ttoAbacn
andauthored
Update BOM to 26.65.0 (#35854)
* Update BOM to 26.65.0 * Fix ArrowConversion * Pin gcp-spanner-bom to 6.95.1 --------- Co-authored-by: Yi Hu <yathu@google.com>
1 parent ff7c389 commit 04ce0b6

File tree

4 files changed

+54
-9
lines changed

4 files changed

+54
-9
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -606,11 +606,11 @@ class BeamModulePlugin implements Plugin<Project> {
606606
def dbcp2_version = "2.9.0"
607607
def errorprone_version = "2.10.0"
608608
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
609-
def gax_version = "2.67.0"
609+
def gax_version = "2.68.2"
610610
def google_ads_version = "33.0.0"
611611
def google_clients_version = "2.0.0"
612612
def google_cloud_bigdataoss_version = "2.2.26"
613-
// [bomupgrader] determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
613+
// [bomupgrader] TODO(#35868): currently pinned, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
614614
def google_cloud_spanner_version = "6.95.1"
615615
def google_code_gson_version = "2.10.1"
616616
def google_oauth_clients_version = "1.34.1"
@@ -648,7 +648,7 @@ class BeamModulePlugin implements Plugin<Project> {
648648
def spotbugs_version = "4.8.3"
649649
def testcontainers_version = "1.19.7"
650650
// [bomupgrader] determined by: org.apache.arrow:arrow-memory-core, consistent with: google_cloud_platform_libraries_bom
651-
def arrow_version = "15.0.2"
651+
def arrow_version = "17.0.0"
652652
def jmh_version = "1.34"
653653
def jupiter_version = "5.7.0"
654654

@@ -732,12 +732,12 @@ class BeamModulePlugin implements Plugin<Project> {
732732
google_api_client_gson : "com.google.api-client:google-api-client-gson:$google_clients_version",
733733
google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_version",
734734
google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version
735-
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20250511-2.0.0", // [bomupgrader] sets version
735+
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20250706-2.0.0", // [bomupgrader] sets version
736736
google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0", // [bomupgrader] sets version
737737
google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20250519-$google_clients_version",
738738
google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_clients_version",
739739
google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_clients_version",
740-
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20250524-2.0.0", // [bomupgrader] sets version
740+
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20250718-2.0.0", // [bomupgrader] sets version
741741
google_auth_library_credentials : "com.google.auth:google-auth-library-credentials", // google_cloud_platform_libraries_bom sets version
742742
google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version
743743
google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version
@@ -749,14 +749,16 @@ class BeamModulePlugin implements Plugin<Project> {
749749
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
750750
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
751751
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
752-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.29.1", // [bomupgrader] sets version
752+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.31.1", // [bomupgrader] sets version
753753
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
754754
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
755755
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
756756
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
757757
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
758-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.62.0",
758+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.65.0",
759759
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
760+
// TODO(#35868) remove pinned google_cloud_spanner_bom after tests or upstream fixed
761+
google_cloud_spanner_bom : "com.google.cloud:google-cloud-spanner-bom:$google_cloud_spanner_version",
760762
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
761763
google_cloud_spanner_test : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests",
762764
google_cloud_vertexai : "com.google.cloud:google-cloud-vertexai", // google_cloud_platform_libraries_bom sets version

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.62.0':
49+
'26.65.0':
5050
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
5151
type: "Apache License 2.0"
5252
paranamer:

sdks/java/extensions/arrow/src/main/java/org/apache/beam/sdk/extensions/arrow/ArrowConversion.java

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,23 @@ public FieldType visit(ArrowType.Utf8 type) {
154154
return FieldType.STRING;
155155
}
156156

157+
@Override
158+
public FieldType visit(ArrowType.Utf8View type) {
159+
throw new IllegalArgumentException(
160+
"Type \'" + type.toString() + "\' not supported.");
161+
}
162+
157163
@Override
158164
public FieldType visit(ArrowType.Binary type) {
159165
return FieldType.BYTES;
160166
}
161167

168+
@Override
169+
public FieldType visit(ArrowType.BinaryView type) {
170+
throw new IllegalArgumentException(
171+
"Type \'" + type.toString() + "\' not supported.");
172+
}
173+
162174
@Override
163175
public FieldType visit(ArrowType.FixedSizeBinary type) {
164176
return FieldType.logicalType(FixedBytes.of(type.getByteWidth()));
@@ -213,6 +225,12 @@ public FieldType visit(ArrowType.Duration type) {
213225
"Type \'" + type.toString() + "\' not supported.");
214226
}
215227

228+
@Override
229+
public FieldType visit(ArrowType.ListView type) {
230+
throw new IllegalArgumentException(
231+
"Type \'" + type.toString() + "\' not supported.");
232+
}
233+
216234
@Override
217235
public FieldType visit(ArrowType.LargeBinary type) {
218236
throw new IllegalArgumentException(
@@ -376,6 +394,11 @@ public Optional<Function<Object, Object>> visit(ArrowType.Duration type) {
376394
throw new IllegalArgumentException("Type \'" + type.toString() + "\' not supported.");
377395
}
378396

397+
@Override
398+
public Optional<Function<Object, Object>> visit(ArrowType.ListView listView) {
399+
return Optional.empty();
400+
}
401+
379402
@Override
380403
public Optional<Function<Object, Object>> visit(ArrowType.Int type) {
381404
return Optional.empty();
@@ -391,11 +414,21 @@ public Optional<Function<Object, Object>> visit(ArrowType.Utf8 type) {
391414
return Optional.of((Object text) -> ((Text) text).toString());
392415
}
393416

417+
@Override
418+
public Optional<Function<Object, Object>> visit(ArrowType.Utf8View utf8View) {
419+
return Optional.empty();
420+
}
421+
394422
@Override
395423
public Optional<Function<Object, Object>> visit(ArrowType.Binary type) {
396424
return Optional.empty();
397425
}
398426

427+
@Override
428+
public Optional<Function<Object, Object>> visit(ArrowType.BinaryView binaryView) {
429+
return Optional.empty();
430+
}
431+
399432
@Override
400433
public Optional<Function<Object, Object>> visit(ArrowType.FixedSizeBinary type) {
401434
return Optional.empty();

sdks/java/io/google-cloud-platform/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,17 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform"
3131
ext.summary = "IO library to read and write Google Cloud Platform systems from Beam."
3232

3333
dependencies {
34-
implementation enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
34+
implementation(enforcedPlatform(library.java.google_cloud_platform_libraries_bom)) {
35+
// TODO(https://github.com/apache/beam/issues/35868) remove exclude after upstream and/or tests fixed
36+
exclude group: "com.google.cloud", module: "google-cloud-spanner"
37+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-v1"
38+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-instance-v1"
39+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-database-v1"
40+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-v1"
41+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-instance-v1"
42+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-database-v1"
43+
}
44+
implementation(enforcedPlatform(library.java.google_cloud_spanner_bom))
3545
implementation project(path: ":model:pipeline", configuration: "shadow")
3646
implementation project(":runners:core-java")
3747
implementation project(path: ":sdks:java:core", configuration: "shadow")

0 commit comments

Comments
 (0)