Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -606,11 +606,11 @@ class BeamModulePlugin implements Plugin<Project> {
def dbcp2_version = "2.9.0"
def errorprone_version = "2.10.0"
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
def gax_version = "2.67.0"
def gax_version = "2.68.2"
def google_ads_version = "33.0.0"
def google_clients_version = "2.0.0"
def google_cloud_bigdataoss_version = "2.2.26"
// [bomupgrader] determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
// [bomupgrader] TODO(#35868): currently pinned, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
def google_cloud_spanner_version = "6.95.1"
def google_code_gson_version = "2.10.1"
def google_oauth_clients_version = "1.34.1"
Expand Down Expand Up @@ -648,7 +648,7 @@ class BeamModulePlugin implements Plugin<Project> {
def spotbugs_version = "4.8.3"
def testcontainers_version = "1.19.7"
// [bomupgrader] determined by: org.apache.arrow:arrow-memory-core, consistent with: google_cloud_platform_libraries_bom
def arrow_version = "15.0.2"
def arrow_version = "17.0.0"
def jmh_version = "1.34"
def jupiter_version = "5.7.0"

Expand Down Expand Up @@ -732,12 +732,12 @@ class BeamModulePlugin implements Plugin<Project> {
google_api_client_gson : "com.google.api-client:google-api-client-gson:$google_clients_version",
google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_version",
google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20250511-2.0.0", // [bomupgrader] sets version
google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20250706-2.0.0", // [bomupgrader] sets version
google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0", // [bomupgrader] sets version
google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20250519-$google_clients_version",
google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_clients_version",
google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_clients_version",
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20250524-2.0.0", // [bomupgrader] sets version
google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20250718-2.0.0", // [bomupgrader] sets version
google_auth_library_credentials : "com.google.auth:google-auth-library-credentials", // google_cloud_platform_libraries_bom sets version
google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version
google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version
Expand All @@ -749,14 +749,16 @@ class BeamModulePlugin implements Plugin<Project> {
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.29.1", // [bomupgrader] sets version
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.31.1", // [bomupgrader] sets version
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.62.0",
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.65.0",
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
// TODO(#35868) remove pinned google_cloud_spanner_bom after tests or upstream fixed
google_cloud_spanner_bom : "com.google.cloud:google-cloud-spanner-bom:$google_cloud_spanner_version",
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
google_cloud_spanner_test : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests",
google_cloud_vertexai : "com.google.cloud:google-cloud-vertexai", // google_cloud_platform_libraries_bom sets version
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/container/license_scripts/dep_urls_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jaxen:
'1.1.6':
type: "3-Clause BSD"
libraries-bom:
'26.62.0':
'26.65.0':
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
type: "Apache License 2.0"
paranamer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,23 @@ public FieldType visit(ArrowType.Utf8 type) {
return FieldType.STRING;
}

@Override
public FieldType visit(ArrowType.Utf8View type) {
throw new IllegalArgumentException(
"Type \'" + type.toString() + "\' not supported.");
}

@Override
public FieldType visit(ArrowType.Binary type) {
return FieldType.BYTES;
}

@Override
public FieldType visit(ArrowType.BinaryView type) {
throw new IllegalArgumentException(
"Type \'" + type.toString() + "\' not supported.");
}

@Override
public FieldType visit(ArrowType.FixedSizeBinary type) {
return FieldType.logicalType(FixedBytes.of(type.getByteWidth()));
Expand Down Expand Up @@ -213,6 +225,12 @@ public FieldType visit(ArrowType.Duration type) {
"Type \'" + type.toString() + "\' not supported.");
}

@Override
public FieldType visit(ArrowType.ListView type) {
throw new IllegalArgumentException(
"Type \'" + type.toString() + "\' not supported.");
}

@Override
public FieldType visit(ArrowType.LargeBinary type) {
throw new IllegalArgumentException(
Expand Down Expand Up @@ -376,6 +394,11 @@ public Optional<Function<Object, Object>> visit(ArrowType.Duration type) {
throw new IllegalArgumentException("Type \'" + type.toString() + "\' not supported.");
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.ListView listView) {
return Optional.empty();
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.Int type) {
return Optional.empty();
Expand All @@ -391,11 +414,21 @@ public Optional<Function<Object, Object>> visit(ArrowType.Utf8 type) {
return Optional.of((Object text) -> ((Text) text).toString());
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.Utf8View utf8View) {
return Optional.empty();
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.Binary type) {
return Optional.empty();
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.BinaryView binaryView) {
return Optional.empty();
}

@Override
public Optional<Function<Object, Object>> visit(ArrowType.FixedSizeBinary type) {
return Optional.empty();
Expand Down
12 changes: 11 additions & 1 deletion sdks/java/io/google-cloud-platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,17 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform"
ext.summary = "IO library to read and write Google Cloud Platform systems from Beam."

dependencies {
implementation enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
implementation(enforcedPlatform(library.java.google_cloud_platform_libraries_bom)) {
// TODO(https://github.com/apache/beam/issues/35868) remove exclude after upstream and/or tests fixed
exclude group: "com.google.cloud", module: "google-cloud-spanner"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-v1"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-instance-v1"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-database-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-instance-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-database-v1"
}
implementation(enforcedPlatform(library.java.google_cloud_spanner_bom))
implementation project(path: ":model:pipeline", configuration: "shadow")
implementation project(":runners:core-java")
implementation project(path: ":sdks:java:core", configuration: "shadow")
Expand Down
Loading