From bb37ef26401c48a0935b2ea58307adc7f0bb5511 Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 25 Sep 2023 11:18:28 -0400 Subject: [PATCH 1/4] Remove unused dependency that is blocking PR 1428 --- google-cloud-firestore/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index fd329140c..da3596e0a 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -55,10 +55,6 @@ io.grpc grpc-protobuf - - io.grpc - grpc-context - com.google.protobuf protobuf-java From a5ec16fab4c50a6f36ff0328f7894747d1e7cf5d Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 25 Sep 2023 11:35:06 -0400 Subject: [PATCH 2/4] Test CI with undo --- google-cloud-firestore/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index da3596e0a..fd329140c 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -55,6 +55,10 @@ io.grpc grpc-protobuf + + io.grpc + grpc-context + com.google.protobuf protobuf-java From bec6e6ea8e49fd47fc3169f44d12e12c2dafa13a Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 25 Sep 2023 11:37:20 -0400 Subject: [PATCH 3/4] Redo --- google-cloud-firestore/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index fd329140c..da3596e0a 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -55,10 +55,6 @@ io.grpc grpc-protobuf - - io.grpc - grpc-context - com.google.protobuf protobuf-java From 030e895a748961aed18b1384cbd71aeefb623f64 Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 25 Sep 2023 11:41:25 -0400 Subject: [PATCH 4/4] Change from 1428 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3d715b20..6d81fffe4 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.15.0 + 3.16.0 pom import