From 3af4a6aa0609726960d84703c8676dc46c0ff3e3 Mon Sep 17 00:00:00 2001 From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:50:05 -0600 Subject: [PATCH 1/4] fix execute options for ServerSideTransaction.java --- .../java/com/google/cloud/firestore/ServerSideTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java index 1c89b2461e..c1a1e27e3f 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java @@ -279,7 +279,7 @@ public ApiFuture execute(@Nonnull Pipeline pipeline) { public ApiFuture execute( @Nonnull Pipeline pipeline, @Nonnull PipelineExecuteOptions options) { try (TraceUtil.Scope ignored = transactionTraceContext.makeCurrent()) { - return pipeline.execute(new PipelineExecuteOptions(), transactionId, null); + return pipeline.execute(options, transactionId, null); } } } From c2e6d9a74a3bd709a23917938387ccbcafdf50fd Mon Sep 17 00:00:00 2001 From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:50:05 -0600 Subject: [PATCH 2/4] fix: Fix sending of Pipeline options when running a Pipeline in a transaction --- .../java/com/google/cloud/firestore/ServerSideTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java index 1c89b2461e..c1a1e27e3f 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java @@ -279,7 +279,7 @@ public ApiFuture execute(@Nonnull Pipeline pipeline) { public ApiFuture execute( @Nonnull Pipeline pipeline, @Nonnull PipelineExecuteOptions options) { try (TraceUtil.Scope ignored = transactionTraceContext.makeCurrent()) { - return pipeline.execute(new PipelineExecuteOptions(), transactionId, null); + return pipeline.execute(options, transactionId, null); } } } From b0a21a685436573e29bc7707f2fe54510a6109d9 Mon Sep 17 00:00:00 2001 From: wu-hui Date: Mon, 20 Apr 2026 16:20:33 -0400 Subject: [PATCH 3/4] test: Fix invalid foo option in ITPipelineTest --- .../java/com/google/cloud/firestore/it/ITPipelineTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java index 8dc73929b2..170859f596 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java @@ -3883,7 +3883,11 @@ public void testPipelineInTransactionsWithOptions() throws Exception { firestore .runTransaction( transaction -> { - PipelineExecuteOptions options = new PipelineExecuteOptions().with("foo", "bar"); + PipelineExecuteOptions options = + new PipelineExecuteOptions() + .withExplainOptions( + new ExplainOptions() + .withExecutionMode(ExplainOptions.ExecutionMode.ANALYZE)); List results = transaction.execute(pipeline, options).get().getResults(); assertThat(results).hasSize(1); From eed0d20e3effb10a83b1051c7521a031e86906a6 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 20 Apr 2026 20:25:37 +0000 Subject: [PATCH 4/4] chore: generate libraries at Mon Apr 20 20:23:08 UTC 2026 --- .github/scripts/update_generation_config.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index 74d0e6cc41..dd857f8d69 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -48,13 +48,14 @@ function update_config() { } # Update an action to a new version in GitHub action. +# the second argument must have the git tag (including "v"). function update_action() { local key_word=$1 local new_value=$2 local file=$3 echo "Update ${key_word} to ${new_value} in ${file}" # use a different delimiter because the key_word contains "/". - sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}" + sed -i -e "s|${key_word}@[^ ]*$|${key_word}@${new_value}|" "${file}" } # The parameters of this script is: @@ -143,12 +144,16 @@ rm -rf tmp-googleapis update_config "googleapis_commitish" "${latest_commit}" "${generation_config}" # Update gapic-generator-java version to the latest -latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") -update_config "gapic_generator_version" "${latest_version}" "${generation_config}" - -# Update composite action version to latest gapic-generator-java version -update_action "googleapis/sdk-platform-java/.github/scripts" \ - "${latest_version}" \ +latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") +update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}" + +# Update the GitHub Actions reference to the latest. +# After the google-cloud-java monorepo migration of sdk-platform-java, +# we cannot rely on the gapic-generator-java version tag. Let's use +# the shared dependencies BOM version +latest_shared_dependencies_bom_version=$(get_latest_released_version "com.google.cloud" "google-cloud-shared-dependencies") +update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \ + "google-cloud-shared-dependencies/v${latest_shared_dependencies_bom_version}" \ "${workflow}" # Update libraries-bom version to the latest