Skip to content

Commit 50de51f

Browse files
lqiu96lqiu96
committed
Merge branch 'main' into PR #2165 to update
2 parents c893bb6 + 8e777fe commit 50de51f

File tree

19 files changed

+77
-73
lines changed

19 files changed

+77
-73
lines changed

‎.github/scripts/update_generation_config.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ function get_latest_released_version() {
1818
group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
1919
url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
2020
xml_content=$(curl -s --fail "${url}")
21-
latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
21+
22+
# 1. Extract all version tags
23+
# 2. Strip the XML tags to leave just the version numbers
24+
# 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
25+
# 4. Sort by version (V) and take the last one (tail -n 1)
26+
latest=$(echo "${xml_content}" \
27+
| grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
28+
| sed -E 's/<[^>]+>//g' \
29+
| sort -V \
30+
| tail -n 1)
31+
2232
if [[ -z "${latest}" ]]; then
2333
echo "The latest version of ${group_id}:${artifact_id} is empty."
2434
echo "The returned json from maven.org is invalid: ${json_content}"

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.64.2
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [3.35.0](https://github.com/googleapis/java-firestore/compare/v3.34.0...v3.35.0) (2026-01-15)
4+
5+
6+
### Features
7+
8+
* Adding gcp resource name span attribute ([#2260](https://github.com/googleapis/java-firestore/issues/2260)) ([926fd8c](https://github.com/googleapis/java-firestore/commit/926fd8c393dfd91f532b61bdf2a50ed8d19d3618))
9+
* Pipelines enters public preview ([#2272](https://github.com/googleapis/java-firestore/issues/2272)) ([6e30a6c](https://github.com/googleapis/java-firestore/commit/6e30a6c11efe5d428607bfd78f82ba7b49497bd9))
10+
11+
12+
### Bug Fixes
13+
14+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.65.1 ([1573a6f](https://github.com/googleapis/java-firestore/commit/1573a6f8b7d08e6670f26e2fe1af730700000aac))
15+
316
## [3.34.0](https://github.com/googleapis/java-firestore/compare/v3.33.4...v3.34.0) (2025-12-12)
417

518

‎README.md‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.72.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.74.0-rc2')
5353
5454
implementation 'com.google.cloud:google-cloud-firestore'
5555
```
5656
If you are using Gradle without BOM, add this to your dependencies:
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-firestore:3.34.0'
59+
implementation 'com.google.cloud:google-cloud-firestore:3.35.0'
6060
```
6161

6262
If you are using SBT, add this to your dependencies:
6363

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.34.0"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.35.0"
6666
```
6767

6868
## Authentication
@@ -195,32 +195,13 @@ information.
195195

196196
Apache 2.0 - See [LICENSE][license] for more information.
197197

198-
## CI Status
199-
200-
Java Version | Status
201-
------------ | ------
202-
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
203-
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
204-
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
205-
Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
206-
207198
Java is a registered trademark of Oracle and/or its affiliates.
208199

209200
[product-docs]: https://cloud.google.com/firestore
210201
[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/history
211-
[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java7.svg
212-
[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java7.html
213-
[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8.svg
214-
[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8.html
215-
[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8-osx.svg
216-
[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8-osx.html
217-
[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8-win.svg
218-
[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8-win.html
219-
[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.svg
220-
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
221202
[stability-image]: https://img.shields.io/badge/stability-stable-green
222203
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
223-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.34.0
204+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.35.0
224205
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
225206
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
226207
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.64.2
2-
googleapis_commitish: b32495a713a68dd0dff90cf0b24021debfca048a
3-
libraries_bom_version: 26.72.0
1+
gapic_generator_version: 2.65.1
2+
googleapis_commitish: 415914bd49d41beaae8a9adb348ee2587c93aa70
3+
libraries_bom_version: 26.74.0-rc2
44
libraries:
55
- api_shortname: firestore
66
name_pretty: Cloud Firestore

‎google-cloud-firestore-admin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>google-cloud-firestore-admin</artifactId>
7-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
7+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
88
<packaging>jar</packaging>
99
<name>Google Cloud Firestore Admin Client</name>
1010
<url>https://github.com/googleapis/java-firestore</url>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-firestore-parent</artifactId>
17-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
17+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore:current} -->
1818
</parent>
1919
<dependencies>
2020
<dependency>

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
* }</pre>
143143
*
144144
* Please refer to the [Client Side Retry
145-
* Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
146-
* additional support in setting retries.
145+
* Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
146+
* retries.
147147
*
148148
* <p>To configure the RetrySettings of a Long Running Operation method, create an
149149
* OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
* }</pre>
164164
*
165165
* Please refer to the [Client Side Retry
166-
* Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
167-
* additional support in setting retries.
166+
* Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
167+
* retries.
168168
*
169169
* <p>To configure the RetrySettings of a Long Running Operation method, create an
170170
* OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to

‎google-cloud-firestore-bom/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-firestore-bom</artifactId>
6-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
6+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -52,37 +52,37 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-firestore</artifactId>
55-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
55+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore:current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.cloud</groupId>
5959
<artifactId>google-cloud-firestore-admin</artifactId>
60-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
60+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.api.grpc</groupId>
6464
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
65-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
65+
<version>3.35.0</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.api.grpc</groupId>
6969
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
70-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
70+
<version>3.35.0</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.api.grpc</groupId>
7474
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
75-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
75+
<version>3.35.0</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.api.grpc</groupId>
7979
<artifactId>proto-google-cloud-firestore-v1</artifactId>
80-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
80+
<version>3.35.0</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
8181
</dependency>
8282
<dependency>
8383
<groupId>com.google.cloud</groupId>
8484
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
85-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
85+
<version>3.35.0</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
8686
</dependency>
8787
</dependencies>
8888
</dependencyManagement>

‎google-cloud-firestore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-firestore</artifactId>
5-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
5+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Firestore</name>
88
<url>https://github.com/googleapis/java-firestore</url>
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-firestore-parent</artifactId>
15-
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
15+
<version>3.35.0</version><!-- {x-version-update:google-cloud-firestore:current} -->
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-firestore</site.installationModule>

0 commit comments

Comments
 (0)