From 2275c13afea3a6129a4cd04f203cfbcbaacfb075 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 00:50:05 +0000 Subject: [PATCH 01/13] chore: release 2.2.5-SNAPSHOT (#570) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-firestore-admin/pom.xml | 4 ++-- google-cloud-firestore-bom/pom.xml | 16 ++++++++-------- google-cloud-firestore/pom.xml | 4 ++-- grpc-google-cloud-firestore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-firestore-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-firestore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-firestore-bundle-v1/pom.xml | 4 ++-- proto-google-cloud-firestore-v1/pom.xml | 4 ++-- versions.txt | 16 ++++++++-------- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml index d7f3cd0592..62d5c0cd73 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 - 2.2.5 + 2.2.6-SNAPSHOT jar Google Cloud Firestore Admin Client https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index 767a9ce64c..6c5480f0c2 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 - 2.2.5 + 2.2.6-SNAPSHOT pom com.google.cloud @@ -63,37 +63,37 @@ com.google.cloud google-cloud-firestore - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.cloud google-cloud-firestore-admin - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 8778cdf403..b62690ab24 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/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 - 2.2.5 + 2.2.6-SNAPSHOT jar Google Cloud Firestore https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT google-cloud-firestore diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml index c33d09f9d8..a373a40eef 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 - 2.2.5 + 2.2.6-SNAPSHOT grpc-google-cloud-firestore-admin-v1 GRPC library for grpc-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml index c4aa31488a..3c2a00d120 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 - 2.2.5 + 2.2.6-SNAPSHOT grpc-google-cloud-firestore-v1 GRPC library for grpc-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index 54a1745ab0..97aa793849 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-firestore-parent pom - 2.2.5 + 2.2.6-SNAPSHOT Google Cloud Firestore Parent https://github.com/googleapis/java-firestore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml index f44f29c202..5a2671725a 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 - 2.2.5 + 2.2.6-SNAPSHOT proto-google-cloud-firestore-admin-v1 PROTO library for proto-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml index 9e0a1c2222..f14f6a1425 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 - 2.2.5 + 2.2.6-SNAPSHOT proto-google-cloud-firestore-bundle-v1 PROTO library for proto-google-cloud-firestore-bundle-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml index 85043dcec5..f758e2d076 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 - 2.2.5 + 2.2.6-SNAPSHOT proto-google-cloud-firestore-v1 PROTO library for proto-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6-SNAPSHOT diff --git a/versions.txt b/versions.txt index d29e88c947..1c3b179577 100644 --- a/versions.txt +++ b/versions.txt @@ -1,11 +1,11 @@ # Format: # module:released-version:current-version -google-cloud-firestore:2.2.5:2.2.5 -google-cloud-firestore-admin:2.2.5:2.2.5 -google-cloud-firestore-bom:2.2.5:2.2.5 -google-cloud-firestore-parent:2.2.5:2.2.5 -grpc-google-cloud-firestore-admin-v1:2.2.5:2.2.5 -grpc-google-cloud-firestore-v1:2.2.5:2.2.5 -proto-google-cloud-firestore-admin-v1:2.2.5:2.2.5 -proto-google-cloud-firestore-v1:2.2.5:2.2.5 +google-cloud-firestore:2.2.5:2.2.6-SNAPSHOT +google-cloud-firestore-admin:2.2.5:2.2.6-SNAPSHOT +google-cloud-firestore-bom:2.2.5:2.2.6-SNAPSHOT +google-cloud-firestore-parent:2.2.5:2.2.6-SNAPSHOT +grpc-google-cloud-firestore-admin-v1:2.2.5:2.2.6-SNAPSHOT +grpc-google-cloud-firestore-v1:2.2.5:2.2.6-SNAPSHOT +proto-google-cloud-firestore-admin-v1:2.2.5:2.2.6-SNAPSHOT +proto-google-cloud-firestore-v1:2.2.5:2.2.6-SNAPSHOT From e44c092cdd7ab3ce8ecf6680b0eaa5146bdf43fd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 12 Mar 2021 13:02:24 +0100 Subject: [PATCH 02/13] chore(deps): update dependency com.google.cloud:google-cloud-firestore to v2.2.5 (#571) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3e35c551c4..c7c02a1b2f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6b26d95b23..86185e6613 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 From 7ada73d3c0a282be8ce2682c2e9c737690d9f891 Mon Sep 17 00:00:00 2001 From: abhijeetshuklaoist Date: Fri, 12 Mar 2021 17:33:37 +0530 Subject: [PATCH 03/13] fix: Removed Jackson dependency (#508) --- google-cloud-firestore/pom.xml | 9 -- .../cloud/firestore/LocalFirestoreHelper.java | 15 ++- .../google/cloud/firestore/MapperTest.java | 94 ++++++++++++++----- 3 files changed, 75 insertions(+), 43 deletions(-) diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index b62690ab24..4c26bd05a7 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -109,10 +109,6 @@ com.google.code.gson gson - - com.fasterxml.jackson.core - jackson-core - com.google.protobuf protobuf-java-util @@ -149,11 +145,6 @@ 0.0.13 test - - com.fasterxml.jackson.core - jackson-databind - test - org.apache.commons commons-lang3 diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java index 5ebd327120..2ac9c033bd 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java @@ -19,8 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doAnswer; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.gax.retrying.RetrySettings; @@ -55,13 +53,15 @@ import com.google.firestore.v1.StructuredQuery.UnaryFilter; import com.google.firestore.v1.Value; import com.google.firestore.v1.Write; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Message; import com.google.protobuf.NullValue; import com.google.type.LatLng; -import java.io.IOException; +import java.lang.reflect.Type; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -970,12 +970,9 @@ public static Map mapAnyType(Object... entries) { } private static Map fromJsonString(String json) { - try { - ObjectMapper mapper = new ObjectMapper(); - return mapper.readValue(json, new TypeReference>() {}); - } catch (IOException e) { - throw new RuntimeException(e); - } + Type type = new TypeToken>() {}.getType(); + Gson gson = new Gson(); + return gson.fromJson(json, type); } public static Map fromSingleQuotedString(String json) { diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java index a64eb466cf..76be4126de 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java @@ -20,9 +20,11 @@ import static com.google.cloud.firestore.LocalFirestoreHelper.mapAnyType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.cloud.Timestamp; import com.google.cloud.firestore.annotation.DocumentId; import com.google.cloud.firestore.annotation.Exclude; import com.google.cloud.firestore.annotation.PropertyName; @@ -43,6 +45,7 @@ import java.util.Objects; import java.util.Set; import org.junit.Test; +import org.junit.function.ThrowingRunnable; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.Spy; @@ -698,11 +701,11 @@ public String getValue() { } private static class PackageConstructorBean { - private String value; + private Timestamp value; PackageConstructorBean() {} - public String getValue() { + public Timestamp getValue() { return value; } } @@ -950,11 +953,20 @@ private static T deserialize(String jsonString, Class clazz) { return deserialize(jsonString, clazz, /*docRef=*/ null); } + private static T deserialize(Map json, Class clazz) { + return deserialize(json, clazz, /*docRef=*/ null); + } + private static T deserialize(String jsonString, Class clazz, DocumentReference docRef) { Map json = fromSingleQuotedString(jsonString); return CustomClassMapper.convertToCustomClass(json, clazz, docRef); } + private static T deserialize( + Map json, Class clazz, DocumentReference docRef) { + return CustomClassMapper.convertToCustomClass(json, clazz, docRef); + } + private static Object serialize(Object object) { return CustomClassMapper.convertToPlainJavaTypes(object); } @@ -1079,23 +1091,35 @@ public void primitiveDeserializeDouble() { @Test public void primitiveDeserializeBigDecimal() { BigDecimalBean beanBigdecimal = deserialize("{'value': 123}", BigDecimalBean.class); - assertEquals(BigDecimal.valueOf(123), beanBigdecimal.value); + assertEquals(BigDecimal.valueOf(123.0), beanBigdecimal.value); beanBigdecimal = deserialize("{'value': '123'}", BigDecimalBean.class); assertEquals(BigDecimal.valueOf(123), beanBigdecimal.value); // Int - BigDecimalBean beanInt = deserialize("{'value': 1}", BigDecimalBean.class); + BigDecimalBean beanInt = + deserialize(Collections.singletonMap("value", 1), BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1), beanInt.value); // Long - BigDecimalBean beanLong = deserialize("{'value': 1234567890123}", BigDecimalBean.class); + BigDecimalBean beanLong = + deserialize( + Collections.singletonMap("value", 1234567890123L), + BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1234567890123L), beanLong.value); // Double - BigDecimalBean beanDouble = deserialize("{'value': 1.1}", BigDecimalBean.class); + BigDecimalBean beanDouble = + deserialize(Collections.singletonMap("value", 1.1), BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1.1), beanDouble.value); + // BigDecimal + BigDecimalBean beanBigDecimal = + deserialize( + Collections.singletonMap("value", BigDecimal.valueOf(1.2)), + BigDecimalBean.class); + assertEquals(BigDecimal.valueOf(1.2), beanBigDecimal.value); + // Boolean try { deserialize("{'value': true}", BigDecimalBean.class); @@ -1117,10 +1141,13 @@ public void primitiveDeserializeFloat() { assertEquals(1.1, beanFloat.value, EPSILON); // Int - FloatBean beanInt = deserialize("{'value': 1}", FloatBean.class); + FloatBean beanInt = + deserialize(Collections.singletonMap("value", 1), FloatBean.class); assertEquals(1, beanInt.value, EPSILON); // Long - FloatBean beanLong = deserialize("{'value': 1234567890123}", FloatBean.class); + FloatBean beanLong = + deserialize( + Collections.singletonMap("value", 1234567890123L), FloatBean.class); assertEquals((float) 1234567890123L, beanLong.value, EPSILON); // Boolean @@ -1213,15 +1240,18 @@ public void primitiveDeserializeLong() { @Test public void primitiveDeserializeWrongTypeMap() { - assertExceptionContains( - "Failed to convert value of type java.util.LinkedHashMap to String " - + "(found in field 'value')", - new Runnable() { - @Override - public void run() { - deserialize("{'value': {'foo': 'bar'}}", StringBean.class); - } - }); + String expectedExceptionMessage = + ".* Failed to convert value of type .*Map to String \\(found in field 'value'\\).*"; + Throwable exception = + assertThrows( + RuntimeException.class, + new ThrowingRunnable() { + @Override + public void run() throws Throwable { + deserialize("{'value': {'foo': 'bar'}}", StringBean.class); + } + }); + assertTrue(exception.getMessage().matches(expectedExceptionMessage)); } @Test @@ -1565,14 +1595,16 @@ public void serializeDoubleBean() { public void serializeIntBean() { IntBean bean = new IntBean(); bean.value = 1; - assertJson("{'value': 1}", serialize(bean)); + assertJson("{'value': 1}", serialize(Collections.singletonMap("value", 1.0))); } @Test public void serializeLongBean() { LongBean bean = new LongBean(); bean.value = 1234567890123L; - assertJson("{'value': 1234567890123}", serialize(bean)); + assertJson( + "{'value': 1.234567890123E12}", + serialize(Collections.singletonMap("value", 1.234567890123E12))); } @Test @@ -2061,8 +2093,12 @@ public void run() { @Test public void packageConstructorCanBeDeserialized() { - PackageConstructorBean bean = deserialize("{'value': 'foo'}", PackageConstructorBean.class); - assertEquals("foo", bean.value); + Timestamp timestamp = Timestamp.now(); + PackageConstructorBean bean = + deserialize( + Collections.singletonMap("value", timestamp), + PackageConstructorBean.class); + assertEquals(timestamp, bean.value); } @Test @@ -2245,10 +2281,10 @@ public void serializingGenericBeansSupported() { recursiveBean.value.value = "foo"; assertJson("{'value': {'value': 'foo'}}", serialize(recursiveBean)); - DoubleGenericBean doubleBean = new DoubleGenericBean<>(); + DoubleGenericBean doubleBean = new DoubleGenericBean<>(); doubleBean.valueA = "foo"; - doubleBean.valueB = 1; - assertJson("{'valueA': 'foo', 'valueB': 1}", serialize(doubleBean)); + doubleBean.valueB = 1.0; + assertJson("{'valueB': 1, 'valueA': 'foo'}", serialize(doubleBean)); } @Test @@ -2486,7 +2522,7 @@ public void run() { public void settersCanOverridePrimitiveSettersSerializing() { NonConflictingSetterSubBean bean = new NonConflictingSetterSubBean(); bean.value = 1; - assertJson("{'value': 1}", serialize(bean)); + assertJson("{'value': 1}", serialize(Collections.singletonMap("value", 1.0))); } @Test @@ -2741,6 +2777,14 @@ public void documentIdsDeserialize() { assertEquals("doc123", deserialize("{}", DocumentIdOnStringField.class, ref).docId); + assertEquals( + "doc123", + deserialize( + Collections.singletonMap("property", 100), + DocumentIdOnStringField.class, + ref) + .docId); + DocumentIdOnStringFieldAsProperty target = deserialize("{'anotherProperty': 100}", DocumentIdOnStringFieldAsProperty.class, ref); assertEquals("doc123", target.docId); From 6a31843e28ffa230264cba00914add6deb1feda5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 12 Mar 2021 04:12:02 -0800 Subject: [PATCH 04/13] chore: regenerate README (#573) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-03-12 12:04:47,314 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-firestore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-03-12 12:04:48,209 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/c21d4c0b-0986-47bd-849f-482bbe7c6b4c/targets - [ ] To automatically regenerate this PR, check this box. --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9d2565f905..fd0df584d3 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "9a8499e4ecfa625646c04d412d5e7d76c0ce3220" + "sha": "7ada73d3c0a282be8ce2682c2e9c737690d9f891" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6" + "sha": "ac8f20f12e7a4c0b0ae1c6fa415f684a25ea82b7" } } ] diff --git a/README.md b/README.md index 570d377919..b68428ae38 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 ``` @@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-firestore' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-firestore:2.2.4' +compile 'com.google.cloud:google-cloud-firestore:2.2.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "2.2.4" +libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "2.2.5" ``` ## Authentication From 517084e478422067779b21d4c92adb6878735300 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 24 Mar 2021 16:08:13 -0700 Subject: [PATCH 05/13] chore(java): detect sample-secrets in build.sh (#575) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/e2f66102-b2e7-4d50-a434-e4a8ca1e0358/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef --- .kokoro/build.sh | 5 +++++ synth.metadata | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index aff27dd32a..4087e719a2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -79,6 +79,11 @@ samples) if [[ -f ${SAMPLES_DIR}/pom.xml ]] then + for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do + [[ -f "$FILE" ]] || continue + source "$FILE" + done + pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ diff --git a/synth.metadata b/synth.metadata index 0bf23d44d1..366f177635 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "7370d21994126d206f51a8c0c1677b5dc0ee030f" + "sha": "6a31843e28ffa230264cba00914add6deb1feda5" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" + "sha": "bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef" } } ], From 4ea12d764bc8142be8b888bb5c79b5428e837c86 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 30 Mar 2021 07:54:03 -0700 Subject: [PATCH 06/13] chore: remove staging bucket v2 (#577) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/a735091d-6ca5-4d23-8a71-79ee62f20aee/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/572ef8f70edd9041f5bcfa71511aed6aecfc2098 --- .kokoro/release/publish_javadoc.sh | 5 ----- synth.metadata | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index d7afe00c2c..065f10e9a0 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then exit 1 fi -if [[ -z "${STAGING_BUCKET_V2}" ]]; then - echo "Need to set STAGING_BUCKET_V2 environment variable" - exit 1 -fi - # work from the git root directory pushd $(dirname "$0")/../../ diff --git a/synth.metadata b/synth.metadata index 366f177635..ee6f7c5149 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "6a31843e28ffa230264cba00914add6deb1feda5" + "sha": "517084e478422067779b21d4c92adb6878735300" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef" + "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" } } ], From 029f01d808afbeb531ee70b78f72bccaadfeb1e0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 12 Apr 2021 07:22:34 -0700 Subject: [PATCH 07/13] build(java): skip javadoc tests during dependencies test (#578) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/1ac128c7-c081-46a7-b2ed-15b3a1132799/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/5b0e1592dd7d70b485e157ea4b3eb1704ecbd015 --- .kokoro/dependencies.sh | 1 + synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c8436c..59d2aafc79 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/synth.metadata b/synth.metadata index ee6f7c5149..b5800018ac 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "517084e478422067779b21d4c92adb6878735300" + "sha": "4ea12d764bc8142be8b888bb5c79b5428e837c86" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" + "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" } } ], From 66e0e88640b97513955dd689cffa5a88bebe5297 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 13 Apr 2021 12:38:04 -0400 Subject: [PATCH 08/13] test: Update assertion in failing test: ITSystemTest.readOnlyTransaction_failureWhenAttemptReadOlderThan60Seconds (#589) --- .../test/java/com/google/cloud/firestore/it/ITSystemTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a5387a38d0..11e53804c2 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 @@ -1535,7 +1535,7 @@ public Void updateCallback(Transaction transaction) throws Exception { final StatusRuntimeException invalidArgument = (StatusRuntimeException) rootCause; final Status status = invalidArgument.getStatus(); assertThat(status.getCode()).isEqualTo(Code.FAILED_PRECONDITION); - assertThat(status.getDescription()).contains("old"); + assertThat(status.getDescription()).contains("minimum"); } } From c83a222bd602a489552276c5202796db7fadeffa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 13 Apr 2021 21:50:04 +0200 Subject: [PATCH 09/13] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 (#584) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `0.20.1` -> `0.21.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/compatibility-slim/0.20.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/0.21.0/confidence-slim/0.20.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v0.21.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​0210-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0201v0210-2021-04-09) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.20.1...v0.21.0) ##### Dependencies - update dependency com.google.auth:google-auth-library-bom to v0.25.0 ([#​310](https://www.github.com/googleapis/java-shared-dependencies/issues/310)) ([8f3a0f0](https://www.github.com/googleapis/java-shared-dependencies/commit/8f3a0f002b787f7b27cfe031654fa20bf342f839)) - update dependency com.google.auth:google-auth-library-bom to v0.25.2 ([#​311](https://www.github.com/googleapis/java-shared-dependencies/issues/311)) ([6c47a3e](https://www.github.com/googleapis/java-shared-dependencies/commit/6c47a3edbd9da04ba255487a66c0f3a41393217d)) - update dependency com.google.errorprone:error_prone_annotations to v2.6.0 ([#​315](https://www.github.com/googleapis/java-shared-dependencies/issues/315)) ([dc254ca](https://www.github.com/googleapis/java-shared-dependencies/commit/dc254ca7359b68fe9411f7b96130ffb416b45c6f)) - update dependency com.google.http-client:google-http-client-bom to v1.39.1 ([#​309](https://www.github.com/googleapis/java-shared-dependencies/issues/309)) ([37225e2](https://www.github.com/googleapis/java-shared-dependencies/commit/37225e2d1b32a618765391720b57ff29e7b8f7f9)) - update dependency com.google.http-client:google-http-client-bom to v1.39.2 ([#​321](https://www.github.com/googleapis/java-shared-dependencies/issues/321)) ([273c66d](https://www.github.com/googleapis/java-shared-dependencies/commit/273c66d374f7cd6040aac2f302fd1c1dc0f4a1c0)) - update dependency com.google.protobuf:protobuf-bom to v3.15.6 ([#​308](https://www.github.com/googleapis/java-shared-dependencies/issues/308)) ([b29dd05](https://www.github.com/googleapis/java-shared-dependencies/commit/b29dd0535f02b56607f64ba69e85d4d468902789)) - update dependency com.google.protobuf:protobuf-bom to v3.15.7 ([#​316](https://www.github.com/googleapis/java-shared-dependencies/issues/316)) ([9c00d77](https://www.github.com/googleapis/java-shared-dependencies/commit/9c00d7753c1f7b963deb9ad69dcfe24ba28da5a2)) - update dependency com.google.protobuf:protobuf-bom to v3.15.8 ([#​319](https://www.github.com/googleapis/java-shared-dependencies/issues/319)) ([15e5ae2](https://www.github.com/googleapis/java-shared-dependencies/commit/15e5ae2ef46eedcd790ffd8644677d36db5c63f9)) - update dependency io.grpc:grpc-bom to v1.37.0 ([#​313](https://www.github.com/googleapis/java-shared-dependencies/issues/313)) ([c599351](https://www.github.com/googleapis/java-shared-dependencies/commit/c5993511c7305e1ced42d73552a93a25dc5e1ac1)) - update gax.version to v1.63.0 ([#​318](https://www.github.com/googleapis/java-shared-dependencies/issues/318)) ([ba709da](https://www.github.com/googleapis/java-shared-dependencies/commit/ba709da6fb0e9bcfc83e663588336598737b46e4)) - update google.core.version to v1.94.4 ([#​305](https://www.github.com/googleapis/java-shared-dependencies/issues/305)) ([0d38f4c](https://www.github.com/googleapis/java-shared-dependencies/commit/0d38f4c9ffadcfd9446712b8bf0729399b0c9e91)) - update google.core.version to v1.94.5 ([#​320](https://www.github.com/googleapis/java-shared-dependencies/issues/320)) ([3439721](https://www.github.com/googleapis/java-shared-dependencies/commit/3439721da83a8b92d9c4b6ecfd158cfb1e1a0503)) - update guava to 30.1.1-android ([#​322](https://www.github.com/googleapis/java-shared-dependencies/issues/322)) ([a6b5d3b](https://www.github.com/googleapis/java-shared-dependencies/commit/a6b5d3b8ccfc352bf0d1678952ce3cd8b7a8361e)) - update iam.version to v1.0.11 ([#​304](https://www.github.com/googleapis/java-shared-dependencies/issues/304)) ([95a5264](https://www.github.com/googleapis/java-shared-dependencies/commit/95a526442b3d24c83782523d38dd3931e828d757)) ##### [0.20.1](https://www.github.com/googleapis/java-shared-dependencies/compare/0.20.0...v0.20.1) (2021-03-09) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.12.2 ([#​301](https://www.github.com/googleapis/java-shared-dependencies/issues/301)) ([7c01eba](https://www.github.com/googleapis/java-shared-dependencies/commit/7c01ebabb6fd65b7404e56651b0ba27f505bb033)) - update dependency com.google.api-client:google-api-client-bom to v1.31.3 ([#​295](https://www.github.com/googleapis/java-shared-dependencies/issues/295)) ([a0774e9](https://www.github.com/googleapis/java-shared-dependencies/commit/a0774e9d62d00614142bc4c14214a83dda66d4ad)) - update dependency com.google.api.grpc:grpc-google-iam-v1 to v1.0.10 ([#​292](https://www.github.com/googleapis/java-shared-dependencies/issues/292)) ([b629789](https://www.github.com/googleapis/java-shared-dependencies/commit/b629789e3a1cc9a7308b829c034b09b06e24fc07)) - update dependency com.google.auth:google-auth-library-bom to v0.24.1 ([#​293](https://www.github.com/googleapis/java-shared-dependencies/issues/293)) ([d85ec34](https://www.github.com/googleapis/java-shared-dependencies/commit/d85ec347ccdd14dfdab10d365d2c2f8df3035e4d)) - update dependency com.google.protobuf:protobuf-bom to v3.15.3 ([#​294](https://www.github.com/googleapis/java-shared-dependencies/issues/294)) ([58c01aa](https://www.github.com/googleapis/java-shared-dependencies/commit/58c01aa076e2c4954986185f913bac2c51a1e6fb)) - update dependency com.google.protobuf:protobuf-bom to v3.15.5 ([#​302](https://www.github.com/googleapis/java-shared-dependencies/issues/302)) ([e9d5e6e](https://www.github.com/googleapis/java-shared-dependencies/commit/e9d5e6ee6039915da186315ceada673ac37b88d3)) - update google.core.version to v1.94.2 ([#​296](https://www.github.com/googleapis/java-shared-dependencies/issues/296)) ([af83b90](https://www.github.com/googleapis/java-shared-dependencies/commit/af83b901be0c03d507189999215d35345602fad7)) - update google.core.version to v1.94.3 ([#​300](https://www.github.com/googleapis/java-shared-dependencies/issues/300)) ([3e73176](https://www.github.com/googleapis/java-shared-dependencies/commit/3e73176af0b07dfe621163b301174b5b5820dfa2))
--- ### Configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-firestore). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97aa793849..5c2c2600fe 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ com.google.cloud google-cloud-shared-dependencies - 0.20.1 + 0.21.0 pom import From 4095fc36f60cdcf124e839d71a25077a339e7e28 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 13 Apr 2021 21:52:03 +0200 Subject: [PATCH 10/13] chore(deps): update dependency com.google.cloud:libraries-bom to v20 (#585) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `19.0.0` -> `20.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/compatibility-slim/19.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.0.0/confidence-slim/19.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-firestore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8ef1a60c17..f0921d2839 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -33,7 +33,7 @@ com.google.cloud libraries-bom - 19.0.0 + 20.0.0 pom import From 32e9cb145459b8e22d6e7b6c7949040f71fc2ef7 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 13 Apr 2021 13:06:03 -0700 Subject: [PATCH 11/13] chore: regenerate README (#580) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-04-12 14:27:08,656 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-firestore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-04-12 14:27:10,077 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/e78b1cef-7196-44df-bd14-b02e291691c9/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index fd0df584d3..95e8574b17 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "7ada73d3c0a282be8ce2682c2e9c737690d9f891" + "sha": "029f01d808afbeb531ee70b78f72bccaadfeb1e0" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ac8f20f12e7a4c0b0ae1c6fa415f684a25ea82b7" + "sha": "0a071b3460344886297a304253bf924aa68ddb7e" } } ] diff --git a/README.md b/README.md index b68428ae38..1713941471 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ If you are using Maven without 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:19.0.0') +implementation platform('com.google.cloud:libraries-bom:20.0.0') compile 'com.google.cloud:google-cloud-firestore' ``` From 520ac441bcb7944be378ec6099b9ec4de37844d4 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 13 Apr 2021 13:10:03 -0700 Subject: [PATCH 12/13] fix: typo (#587) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/c80c6e83-aee8-4963-977f-b72615b230f9/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/082e1ca0863b13ada8594fe91845380765da5b70 --- .kokoro/build.sh | 2 +- synth.metadata | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4087e719a2..022d5c9e50 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/synth.metadata b/synth.metadata index b5800018ac..b35bd164f9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "4ea12d764bc8142be8b888bb5c79b5428e837c86" + "sha": "029f01d808afbeb531ee70b78f72bccaadfeb1e0" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" + "sha": "082e1ca0863b13ada8594fe91845380765da5b70" } } ], @@ -63,6 +63,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", From ea9c908a3da390d5417662a9cc25a1454b0a1389 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 20:18:03 +0000 Subject: [PATCH 13/13] chore: release 2.2.6 (#572) :robot: I have created a release \*beep\* \*boop\* --- ### [2.2.6](https://www.github.com/googleapis/java-firestore/compare/v2.2.5...v2.2.6) (2021-04-13) ### Bug Fixes * Removed Jackson dependency ([#508](https://www.github.com/googleapis/java-firestore/issues/508)) ([7ada73d](https://www.github.com/googleapis/java-firestore/commit/7ada73d3c0a282be8ce2682c2e9c737690d9f891)) * typo ([#587](https://www.github.com/googleapis/java-firestore/issues/587)) ([520ac44](https://www.github.com/googleapis/java-firestore/commit/520ac441bcb7944be378ec6099b9ec4de37844d4)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#584](https://www.github.com/googleapis/java-firestore/issues/584)) ([c83a222](https://www.github.com/googleapis/java-firestore/commit/c83a222bd602a489552276c5202796db7fadeffa)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ google-cloud-firestore-admin/pom.xml | 4 ++-- google-cloud-firestore-bom/pom.xml | 16 ++++++++-------- google-cloud-firestore/pom.xml | 4 ++-- grpc-google-cloud-firestore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-firestore-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-firestore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-firestore-bundle-v1/pom.xml | 4 ++-- proto-google-cloud-firestore-v1/pom.xml | 4 ++-- versions.txt | 16 ++++++++-------- 11 files changed, 49 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 740478566e..9ade21269a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [2.2.6](https://www.github.com/googleapis/java-firestore/compare/v2.2.5...v2.2.6) (2021-04-13) + + +### Bug Fixes + +* Removed Jackson dependency ([#508](https://www.github.com/googleapis/java-firestore/issues/508)) ([7ada73d](https://www.github.com/googleapis/java-firestore/commit/7ada73d3c0a282be8ce2682c2e9c737690d9f891)) +* typo ([#587](https://www.github.com/googleapis/java-firestore/issues/587)) ([520ac44](https://www.github.com/googleapis/java-firestore/commit/520ac441bcb7944be378ec6099b9ec4de37844d4)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#584](https://www.github.com/googleapis/java-firestore/issues/584)) ([c83a222](https://www.github.com/googleapis/java-firestore/commit/c83a222bd602a489552276c5202796db7fadeffa)) + ### [2.2.5](https://www.github.com/googleapis/java-firestore/compare/v2.2.4...v2.2.5) (2021-03-11) diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml index 62d5c0cd73..e2710ee1a9 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 - 2.2.6-SNAPSHOT + 2.2.6 jar Google Cloud Firestore Admin Client https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index 6c5480f0c2..01531d8871 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 - 2.2.6-SNAPSHOT + 2.2.6 pom com.google.cloud @@ -63,37 +63,37 @@ com.google.cloud google-cloud-firestore - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.cloud google-cloud-firestore-admin - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 4c26bd05a7..cf495ffded 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/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 - 2.2.6-SNAPSHOT + 2.2.6 jar Google Cloud Firestore https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 google-cloud-firestore diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml index a373a40eef..864499ba4e 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 - 2.2.6-SNAPSHOT + 2.2.6 grpc-google-cloud-firestore-admin-v1 GRPC library for grpc-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml index 3c2a00d120..7af60f5711 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 - 2.2.6-SNAPSHOT + 2.2.6 grpc-google-cloud-firestore-v1 GRPC library for grpc-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/pom.xml b/pom.xml index 5c2c2600fe..de3cd5d00e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-firestore-parent pom - 2.2.6-SNAPSHOT + 2.2.6 Google Cloud Firestore Parent https://github.com/googleapis/java-firestore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.6-SNAPSHOT + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml index 5a2671725a..99d6049561 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 - 2.2.6-SNAPSHOT + 2.2.6 proto-google-cloud-firestore-admin-v1 PROTO library for proto-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml index f14f6a1425..ee8fa40178 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 - 2.2.6-SNAPSHOT + 2.2.6 proto-google-cloud-firestore-bundle-v1 PROTO library for proto-google-cloud-firestore-bundle-v1 com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml index f758e2d076..750987d035 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 - 2.2.6-SNAPSHOT + 2.2.6 proto-google-cloud-firestore-v1 PROTO library for proto-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.6-SNAPSHOT + 2.2.6 diff --git a/versions.txt b/versions.txt index 1c3b179577..7232fa607c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,11 +1,11 @@ # Format: # module:released-version:current-version -google-cloud-firestore:2.2.5:2.2.6-SNAPSHOT -google-cloud-firestore-admin:2.2.5:2.2.6-SNAPSHOT -google-cloud-firestore-bom:2.2.5:2.2.6-SNAPSHOT -google-cloud-firestore-parent:2.2.5:2.2.6-SNAPSHOT -grpc-google-cloud-firestore-admin-v1:2.2.5:2.2.6-SNAPSHOT -grpc-google-cloud-firestore-v1:2.2.5:2.2.6-SNAPSHOT -proto-google-cloud-firestore-admin-v1:2.2.5:2.2.6-SNAPSHOT -proto-google-cloud-firestore-v1:2.2.5:2.2.6-SNAPSHOT +google-cloud-firestore:2.2.6:2.2.6 +google-cloud-firestore-admin:2.2.6:2.2.6 +google-cloud-firestore-bom:2.2.6:2.2.6 +google-cloud-firestore-parent:2.2.6:2.2.6 +grpc-google-cloud-firestore-admin-v1:2.2.6:2.2.6 +grpc-google-cloud-firestore-v1:2.2.6:2.2.6 +proto-google-cloud-firestore-admin-v1:2.2.6:2.2.6 +proto-google-cloud-firestore-v1:2.2.6:2.2.6