diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 650cdd944d37..41caeb00c6e1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -608,7 +608,7 @@ class BeamModulePlugin implements Plugin { def dbcp2_version = "2.9.0" def errorprone_version = "2.31.0" // [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom - def gax_version = "2.68.2" + def gax_version = "2.71.0" def google_ads_version = "33.0.0" def google_clients_version = "2.0.0" def google_cloud_bigdataoss_version = "2.2.26" @@ -637,7 +637,7 @@ class BeamModulePlugin implements Plugin { def netty_version = "4.1.110.Final" def postgres_version = "42.2.16" // [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom - def protobuf_version = "4.29.4" + def protobuf_version = "4.33.0" def qpid_jms_client_version = "0.61.0" def quickcheck_version = "1.0" def sbe_tool_version = "1.25.1" @@ -736,11 +736,11 @@ class BeamModulePlugin implements Plugin { 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-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_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-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-rev20250718-2.0.0", // [bomupgrader] sets version + google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20250925-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 @@ -752,13 +752,13 @@ class BeamModulePlugin implements Plugin { 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.31.1", // [bomupgrader] sets version + google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.32.3", // [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.65.0", + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.71.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", @@ -1356,7 +1356,7 @@ class BeamModulePlugin implements Plugin { "com.google.auto.service:auto-service-annotations:$autoservice_version", "com.google.auto.value:auto-value-annotations:$autovalue_version", "com.google.code.findbugs:jsr305:$jsr305_version", - "com.google.j2objc:j2objc-annotations:3.0.0", + "com.google.j2objc:j2objc-annotations:3.1", // These dependencies are needed to avoid error-prone warnings on package-info.java files, // also to include the annotations to suppress warnings. // diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 08aad3dbaff5..5334538cc09f 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -45,6 +45,7 @@ dependencies { // this dependency is a provided dependency for kafka-avro-serializer. It is not needed to compile with Java<=17 // but needed for compile only under Java21, specifically, required for extending from AbstractKafkaAvroDeserializer compileOnly library.java.kafka + permitUnusedDeclared library.java.kafka } implementation library.java.kafka_clients implementation project(path: ":sdks:java:core", configuration: "shadow") diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 93f5f6fa211f..06e6235fd2de 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -46,7 +46,7 @@ jaxen: '1.1.6': type: "3-Clause BSD" libraries-bom: - '26.65.0': + '26.71.0': license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java index d8c580a0cd18..94e33015a627 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java @@ -36,7 +36,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.temporal.ChronoUnit; -import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Supplier; @@ -262,7 +262,6 @@ public class BeamRowToStorageApiProtoTest { .put("booleanvalue", true) .put("bytesvalue", ByteString.copyFrom(BYTES)) .put("arrayvalue", ImmutableList.of("one", "two", "red", "blue")) - .put("arraynullvalue", Collections.emptyList()) .put("iterablevalue", ImmutableList.of("blue", "red", "two", "one")) .put( "sqldatevalue", @@ -472,7 +471,7 @@ private void assertBaseRecord(DynamicMessage msg) { Map recordFields = msg.getAllFields().entrySet().stream() .collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue)); - assertEquals(BASE_PROTO_EXPECTED_FIELDS, recordFields); + assertEquals(new HashMap<>(BASE_PROTO_EXPECTED_FIELDS), new HashMap<>(recordFields)); } @Test diff --git a/settings.gradle.kts b/settings.gradle.kts index 72c5194ec93d..1f634fd66f7f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -201,7 +201,6 @@ include(":sdks:java:extensions:sql:perf-tests") include(":sdks:java:extensions:sql:jdbc") include(":sdks:java:extensions:sql:hcatalog") include(":sdks:java:extensions:sql:datacatalog") -include(":sdks:java:extensions:sql:zetasql") include(":sdks:java:extensions:sql:expansion-service") include(":sdks:java:extensions:sql:udf") include(":sdks:java:extensions:sql:udf-test-provider")