Merge branch 'main' into markduckworth/execute-options-fix

Author: wu-hui

.agents/skills/verify-local-changes/SKILL.md

@@ -0,0 +1,95 @@
+---
+name: Verify Local Changes
+description: Verifies local Java SDK changes.
+---
+
+# Verify Local Changes
+
+This skill documents how to verify local code changes for the Java Firestore SDK. This should be run **every time** you complete a fix or feature and are prepared to push a pull request.
+
+## Prerequisites
+
+Ensure you have Maven installed and are in the `java-firestore` directory before running commands.
+
+---
+
+## Step 0: Format the Code
+
+Run the formatter to ensure formatting checks pass:
+
+```bash
+mvn com.spotify.fmt:fmt-maven-plugin:format
+```
+
+---
+
+## Step 1: Unit Testing (Isolated then Suite)
+
+1.  **Identify modified unit tests** in your changes.
+2.  **Run specific units only** to test isolated logic regressions:
+    ```bash
+    mvn test -Dtest=MyUnitTest#testMethod
+    ```
+3.  **Run the entire unit test suite** that contains those modified tests if the isolated unit tests pass:
+    ```bash
+    mvn test -Dtest=MyUnitTest
+    ```
+
+---
+
+## Step 2: Integration Testing (Isolated then Suite)
+
+### 💡 Integration Test Nuances (from `ITBaseTest.java`)
+
+When running integration tests, configure your execution using properties or environment variables:
+
+-   **`FIRESTORE_EDITION`**: 
+    -   `standard` (Default)
+    -   `enterprise`
+    -   *Note*: **Pipelines can only be run against `enterprise` editions**, while standard Queries run on both.
+-   **`FIRESTORE_NAMED_DATABASE`**: 
+    -   Enterprise editions usually require a named database (often `enterprise`). Adjust this flag if pointing to specific instances.
+-   **`FIRESTORE_TARGET_BACKEND`**:
+    -   `PROD` (Default)
+    -   `QA` (points to standard sandboxes)
+    -   `NIGHTLY` (points to `test-firestore.sandbox.googleapis.com:443`)
+    -   `EMULATOR` (points to `localhost:8080`)
+
+1.  **Identify modified integration tests** (usually Starting in `IT`).
+2.  **Run specific integration tests only** (isolated checks run quicker):
+    ```bash
+    mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae
+    ```
+3.  **Run the entire integration test suite** for the modified class if isolation tests pass:
+    ```bash
+    mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae
+    ```
+
+
+
+---
+
+## Step 3: Full Suite Regressions
+
+Run the full integration regression suite once you are confident subsets pass:
+
+```bash
+mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae
+```
+
+---
+
+> [!TIP]
+> Use `-Dclirr.skip=true -Denforcer.skip=true` to speed up iterations where appropriate without leaking compliance checks.
+
+---
+
+## 🛠️ Troubleshooting & Source of Truth
+
+If you run into issues executing tests with the commands above, **consult the Kokoro configuration files** as the ultimate source of truth:
+
+-   **Presubmit configurations**: See `.kokoro/presubmit/integration.cfg` (or `integration-named-db.cfg`)
+-   **Nightly configurations**: See `.kokoro/nightly/integration.cfg` 
+-   **Build shell scripts**: See `.kokoro/build.sh`
+
+These files define the exact environment variables (e.g., specific endpoints or endpoints overrides) the CI server uses!

.github/.OwlBot-hermetic.yaml

@@ -5,6 +5,7 @@ deep-remove-regex:
 - "/google-cloud-firestore-admin/src"
 
 deep-preserve-regex:
+- "/.*google-.*/src/main/java/.*/stub/Version.java"
 - "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
 - "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentPathName.java"
 - "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AnyPathName.java"

.github/CODEOWNERS

@@ -8,7 +8,7 @@
 *                       @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/firestore-team
+**/*.java               @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # For generated Java code
 proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/firestore-team

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0
+    - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged-dependency-check.yaml

@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.58.0
+      uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v1.85.0
       with:
         bom-path: google-cloud-firestore-bom/pom.xml

.kokoro/presubmit/graalvm-native-a.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-b.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-c.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [3.41.0](https://github.com/googleapis/java-firestore/compare/v3.40.0...v3.41.0) (2026-04-14)
+
+
+### Features
+
+* Add `expiration_offset` to `Field` ([c29d25d](https://github.com/googleapis/java-firestore/commit/c29d25db9dcbfbee4eda2db21528f99d63e5cb6e))
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.71.0 ([c29d25d](https://github.com/googleapis/java-firestore/commit/c29d25db9dcbfbee4eda2db21528f99d63e5cb6e))
+
+
+### Dependencies
+
+* Update sdk-platform-java-config to 3.61.0 ([#2359](https://github.com/googleapis/java-firestore/issues/2359)) ([33e33fa](https://github.com/googleapis/java-firestore/commit/33e33fa0c55c0f210cd148bb0ed0fbeb1a883228))
+
+## [3.40.0](https://github.com/googleapis/java-firestore/compare/v3.39.0...v3.40.0) (2026-04-08)
+
+
+### Features
+
+* Add `isType` expression ([#2329](https://github.com/googleapis/java-firestore/issues/2329)) ([c606ff9](https://github.com/googleapis/java-firestore/commit/c606ff989e1305214d29496734f2a34628e4c82a))
+* Add DML stages to pipelines ([#2317](https://github.com/googleapis/java-firestore/issues/2317)) ([2dc2464](https://github.com/googleapis/java-firestore/commit/2dc2464206a899794746ebbe20e3fc048770a0b2))
+* Add string pipeline expressions ([#2326](https://github.com/googleapis/java-firestore/issues/2326)) ([93db04e](https://github.com/googleapis/java-firestore/commit/93db04e4bce569c54359648b4122a732d0c9df73))
+* Add subquery support in pipeline ([#2323](https://github.com/googleapis/java-firestore/issues/2323)) ([cbf87ac](https://github.com/googleapis/java-firestore/commit/cbf87acd66f5c3fbdbd5d922e22790347f44f22d))
+* Add support for remaining `map` pipeline expressions ([#2321](https://github.com/googleapis/java-firestore/issues/2321)) ([f61c61f](https://github.com/googleapis/java-firestore/commit/f61c61f42c472d5540dd616c17db3655502ccdf6))
+* Add support for the parent expression and fix integration tests error ([#2351](https://github.com/googleapis/java-firestore/issues/2351)) ([0e30ec4](https://github.com/googleapis/java-firestore/commit/0e30ec455273719f8d29471c001f4aeb38ecf51a))
+* Add timestamp expressions ([#2342](https://github.com/googleapis/java-firestore/issues/2342)) ([f8adbaa](https://github.com/googleapis/java-firestore/commit/f8adbaa1464a55b7ec004cbe2c7b5145095b0f04))
+* Added public preview support for full-text search and geo search in Pipelines. ([#2346](https://github.com/googleapis/java-firestore/issues/2346)) ([0c81885](https://github.com/googleapis/java-firestore/commit/0c8188520dfbada0d3fef0719e4f95fc231306be))
+* **firestore:** Add `ifNull` and `coalesce` expressions ([#2349](https://github.com/googleapis/java-firestore/issues/2349)) ([51a1c43](https://github.com/googleapis/java-firestore/commit/51a1c4392c19def6aa8a15a7409c7e05476033a8))
+* **firestore:** Add array expressions ([#2350](https://github.com/googleapis/java-firestore/issues/2350)) ([1d23f18](https://github.com/googleapis/java-firestore/commit/1d23f18f70b2b232a4631fe6dab18a8ceb05cb4c))
+* **firestore:** Add logical expressions ([#2339](https://github.com/googleapis/java-firestore/issues/2339)) ([b2f79ec](https://github.com/googleapis/java-firestore/commit/b2f79ec84db91874a717dfaea8bf8f0df9f45c4d))
+* Graduate Pipeline and related APIs from beta to GA ([#2352](https://github.com/googleapis/java-firestore/issues/2352)) ([4cd5895](https://github.com/googleapis/java-firestore/commit/4cd58958191687ea03fadbcc2a4eb6e2f33730b1))
+
 ## [3.39.0](https://github.com/googleapis/java-firestore/compare/v3.38.0...v3.39.0) (2026-03-23)
 
 

README.md

@@ -49,20 +49,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.78.0')
+implementation platform('com.google.cloud:libraries-bom:26.79.0')
 
 implementation 'com.google.cloud:google-cloud-firestore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-firestore:3.39.0'
+implementation 'com.google.cloud:google-cloud-firestore:3.41.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.39.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.41.0"
 ```
 
 ## Authentication
@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/history
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.39.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.41.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles