Skip to content

Commit f819f2e

Browse files
authored
Update bom to 26.74.0 (excluding spanner) (#37384)
* Update bom to 26.74.0 (excluding spanner) * remove explicit sm dep
1 parent 7a278e2 commit f819f2e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ class BeamModulePlugin implements Plugin<Project> {
609609
def dbcp2_version = "2.9.0"
610610
def errorprone_version = "2.31.0"
611611
// [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom
612-
def gax_version = "2.72.2"
612+
def gax_version = "2.73.1"
613613
def google_ads_version = "33.0.0"
614614
def google_clients_version = "2.0.0"
615615
def google_cloud_bigdataoss_version = "2.2.26"
@@ -754,14 +754,14 @@ class BeamModulePlugin implements Plugin<Project> {
754754
google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version
755755
google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version
756756
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
757-
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.33.1", // [bomupgrader] sets version
757+
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.33.2", // [bomupgrader] sets version
758758
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
759759
google_cloud_kms : "com.google.cloud:google-cloud-kms", // google_cloud_platform_libraries_bom sets version
760760
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
761761
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
762762
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
763763
// libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
764-
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.73.0",
764+
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.74.0",
765765
google_cloud_secret_manager : "com.google.cloud:google-cloud-secretmanager", // google_cloud_platform_libraries_bom sets version
766766
// TODO(#35868) remove pinned google_cloud_spanner_bom after tests or upstream fixed
767767
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: 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.73.0':
49+
'26.74.0':
5050
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
5151
type: "Apache License 2.0"
5252
paranamer:

sdks/java/core/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ dependencies {
133133
shadowTest library.java.log4j
134134
shadowTest library.java.log4j2_api
135135
shadowTest library.java.jamm
136-
shadowTest 'com.google.cloud:google-cloud-secretmanager:2.75.0'
137-
shadowTest 'com.google.cloud:google-cloud-kms:2.75.0'
138-
shadowTest 'com.google.crypto.tink:tink:1.19.0'
136+
shadowTest enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
137+
shadowTest library.java.google_cloud_secret_manager
138+
shadowTest library.java.google_cloud_kms
139+
shadowTest library.java.google_cloud_tink
139140
testRuntimeOnly library.java.slf4j_jdk14
140141
}
141142

0 commit comments

Comments
 (0)