diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index aadf54f64..73568a1e9 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337 + digest: sha256:af2eda87a54601ae7b7b2be5055c17b43ac98a7805b586772db314de8a7d4a1d +# created: 2023-06-16T02:10:09.149325782Z diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c8f413b0d..fde1ced49 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,10 +5,13 @@ updates: schedule: interval: "daily" # Disable version updates for Maven dependencies - open-pull-requests-limit: 0 + # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies. + ignore: "*" - package-ecosystem: "pip" directory: "/" schedule: interval: "daily" # Disable version updates for pip dependencies - open-pull-requests-limit: 0 \ No newline at end of file + # If a security vulnerability comes in, we will be notified about + # it via template in the synthtool repository. + ignore: "*" diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d8aaad39..7a4bf5539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [3.13.1](https://github.com/googleapis/java-firestore/compare/v3.13.0...v3.13.1) (2023-06-21) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.23 ([#1329](https://github.com/googleapis/java-firestore/issues/1329)) ([ea5e78f](https://github.com/googleapis/java-firestore/commit/ea5e78fd136cad86ce439ca0e7338ed84ef1a3d7)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 ([#1330](https://github.com/googleapis/java-firestore/issues/1330)) ([63a01e6](https://github.com/googleapis/java-firestore/commit/63a01e6034ed2c6f6f3613da01ca07d6dffb1909)) + ## [3.13.0](https://github.com/googleapis/java-firestore/compare/v3.12.1...v3.13.0) (2023-06-12) diff --git a/README.md b/README.md index 87d0689b8..7a654a303 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.16.0 + 26.17.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-firestore - 3.12.1 + 3.13.0 ``` @@ -50,20 +50,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.16.0') +implementation platform('com.google.cloud:libraries-bom:26.17.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.12.1' +implementation 'com.google.cloud:google-cloud-firestore:3.13.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.12.1" +libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.13.0" ``` @@ -222,7 +222,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html [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.12.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.13.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 diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml index 01ac0f484..863e0419f 100644 --- a/google-cloud-firestore-admin/pom.xml +++ b/google-cloud-firestore-admin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore-admin - 3.13.0 + 3.13.1 jar Google Cloud Firestore Admin Client https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index 3ea99da44..c8d073d1d 100644 --- a/google-cloud-firestore-bom/pom.xml +++ b/google-cloud-firestore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-firestore-bom - 3.13.0 + 3.13.1 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-firestore - 3.13.0 + 3.13.1 com.google.cloud google-cloud-firestore-admin - 3.13.0 + 3.13.1 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 3.13.0 + 3.13.1 diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 6e513caa7..13864bf61 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-firestore - 3.13.0 + 3.13.1 jar Google Cloud Firestore https://github.com/googleapis/java-firestore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 google-cloud-firestore diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java index 14dd40819..57d13e0ed 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java @@ -91,7 +91,7 @@ public TransactionOptionsType getType() { /** * A {@link Timestamp} specifying the time documents are to be read at. If null, the server will * read documents at the most up to date available. If non-null, the specified {@code Timestamp} - * may not be more than 60 seconds in the past (evaluated when the request is processed by the + * may not be more than 60 minutes in the past (evaluated when the request is processed by the * server). * * @return The specific time to read documents at. A null value means reading the most up to date @@ -239,10 +239,10 @@ public TimestampOrBuilder getReadTime() { } /** - * Specify to read documents at the given time. This may not be more than 60 seconds in the past + * Specify to read documents at the given time. This may not be more than 60 minutes in the past * from when the request is processed by the server. * - * @param readTime The specific time to read documents at. Must not be older than 60 seconds. A + * @param readTime The specific time to read documents at. Must not be older than 60 minutes. A * null value means read most up to date data. * @return {@code this} builder */ diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionRunner.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionRunner.java index 420f41e08..c247b1bed 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionRunner.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionRunner.java @@ -126,9 +126,7 @@ public ApiFuture apply(Void input) { final SettableApiFuture backoff = SettableApiFuture.create(); // Add a backoff delay. At first, this is 0. firestoreExecutor.schedule( - () -> { - backoff.set(null); - }, + () -> backoff.set(null), nextBackoffAttempt.getRandomizedRetryDelay().toMillis(), TimeUnit.MILLISECONDS); diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java index 51e561ff7..ef036998e 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java @@ -1559,12 +1559,15 @@ public void readOnlyTransaction_failureWhenAttemptReadOlderThan60Seconds() throws ExecutionException, InterruptedException, TimeoutException { final DocumentReference documentReference = randomColl.add(SINGLE_FIELD_MAP).get(); - // Exception isn't thrown until 5 minutes. - final long tenMinutes = System.currentTimeMillis() / 1000 - 600; + // Exception isn't thrown until 60 minutes. + // To ensure we exceed this, we use 120 minutes. + // If this test fails, we should likely be update documentation to reflect new value. See all + // usages of "Read Time" on proto, and within SDK. + final long twoHours = System.currentTimeMillis() / 1000 - 7200; final TransactionOptions options = TransactionOptions.createReadOnlyOptionsBuilder() .setReadTime( - com.google.protobuf.Timestamp.newBuilder().setSeconds(tenMinutes).setNanos(0)) + com.google.protobuf.Timestamp.newBuilder().setSeconds(twoHours).setNanos(0)) .build(); final ApiFuture runTransaction = diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml index fc812b91d..0af2c9948 100644 --- a/grpc-google-cloud-firestore-admin-v1/pom.xml +++ b/grpc-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 grpc-google-cloud-firestore-admin-v1 GRPC library for grpc-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml index 1c2159ca4..b6a23d28d 100644 --- a/grpc-google-cloud-firestore-v1/pom.xml +++ b/grpc-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 grpc-google-cloud-firestore-v1 GRPC library for grpc-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/pom.xml b/pom.xml index 6e2f853aa..641f95e47 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-firestore-parent pom - 3.13.0 + 3.13.1 Google Cloud Firestore Parent https://github.com/googleapis/java-firestore @@ -150,32 +150,32 @@ com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 com.google.cloud google-cloud-firestore - 3.13.0 + 3.13.1 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 3.13.0 + 3.13.1 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 @@ -195,7 +195,7 @@ com.google.truth truth - 1.1.4 + 1.1.5 test diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml index 8a52f5d5b..30840c659 100644 --- a/proto-google-cloud-firestore-admin-v1/pom.xml +++ b/proto-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.13.0 + 3.13.1 proto-google-cloud-firestore-admin-v1 PROTO library for proto-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml index a70b40d0c..25c5cec37 100644 --- a/proto-google-cloud-firestore-bundle-v1/pom.xml +++ b/proto-google-cloud-firestore-bundle-v1/pom.xml @@ -5,14 +5,14 @@ 4.0.0 proto-google-cloud-firestore-bundle-v1 - 3.13.0 + 3.13.1 proto-google-cloud-firestore-bundle-v1 PROTO library for proto-google-cloud-firestore-bundle-v1 com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml index cb7700aa2..bc3c95d23 100644 --- a/proto-google-cloud-firestore-v1/pom.xml +++ b/proto-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.13.0 + 3.13.1 proto-google-cloud-firestore-v1 PROTO library for proto-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 3.13.0 + 3.13.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6c2022513..714cb1aad 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-firestore - 3.12.1 + 3.13.0 @@ -55,7 +55,7 @@ com.google.truth truth - 1.1.4 + 1.1.5 test diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 26365c714..0e02a3f65 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -32,7 +32,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.google.cloud libraries-bom - 26.16.0 + 26.17.0 pom import @@ -66,7 +66,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.google.truth truth - 1.1.4 + 1.1.5 test @@ -102,7 +102,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.graalvm.buildtools junit-platform-native - 0.9.22 + 0.9.23 test @@ -123,7 +123,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.graalvm.buildtools native-maven-plugin - 0.9.22 + 0.9.23 true com.example.firestore.NativeImageFirestoreSample diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9487d3062..dfab8964d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-firestore - 3.12.1 + 3.13.0 @@ -41,7 +41,7 @@ com.google.truth truth - 1.1.4 + 1.1.5 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0279f3860..bfd7e4474 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -34,7 +34,7 @@ com.google.cloud libraries-bom - 26.16.0 + 26.17.0 pom import @@ -69,7 +69,7 @@ com.google.truth truth - 1.1.4 + 1.1.5 test diff --git a/versions.txt b/versions.txt index d5818390e..4e4249965 100644 --- a/versions.txt +++ b/versions.txt @@ -1,11 +1,11 @@ # Format: # module:released-version:current-version -google-cloud-firestore:3.13.0:3.13.0 -google-cloud-firestore-admin:3.13.0:3.13.0 -google-cloud-firestore-bom:3.13.0:3.13.0 -grpc-google-cloud-firestore-admin-v1:3.13.0:3.13.0 -grpc-google-cloud-firestore-v1:3.13.0:3.13.0 -proto-google-cloud-firestore-admin-v1:3.13.0:3.13.0 -proto-google-cloud-firestore-v1:3.13.0:3.13.0 -proto-google-cloud-firestore-bundle-v1:3.13.0:3.13.0 +google-cloud-firestore:3.13.1:3.13.1 +google-cloud-firestore-admin:3.13.1:3.13.1 +google-cloud-firestore-bom:3.13.1:3.13.1 +grpc-google-cloud-firestore-admin-v1:3.13.1:3.13.1 +grpc-google-cloud-firestore-v1:3.13.1:3.13.1 +proto-google-cloud-firestore-admin-v1:3.13.1:3.13.1 +proto-google-cloud-firestore-v1:3.13.1:3.13.1 +proto-google-cloud-firestore-bundle-v1:3.13.1:3.13.1