From 036ff9aff324304e31d6cbb6a41dc04ec811abb8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 May 2022 19:41:35 +0000 Subject: [PATCH 1/3] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02702690..33ef605e 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.10.0 + 2.12.0 pom import From 4e79432c5c43e9bf522d92d897e27a9a1781d911 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Mon, 23 May 2022 17:23:50 -0400 Subject: [PATCH 2/3] Override perfmark version to 0.25.0 to resolve dependency conflict. --- google-cloud-binary-authorization/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/google-cloud-binary-authorization/pom.xml b/google-cloud-binary-authorization/pom.xml index 85042753..e75302be 100644 --- a/google-cloud-binary-authorization/pom.xml +++ b/google-cloud-binary-authorization/pom.xml @@ -71,6 +71,11 @@ io.grafeas grafeas + + io.perfmark + perfmark-api + 0.25.0 + From be379e11e024b46bd8099af7888581e6bee8138a Mon Sep 17 00:00:00 2001 From: Blake Li Date: Mon, 23 May 2022 17:33:34 -0400 Subject: [PATCH 3/3] Move perfmark dependency to dependencyManagement section. --- google-cloud-binary-authorization/pom.xml | 5 ----- pom.xml | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/google-cloud-binary-authorization/pom.xml b/google-cloud-binary-authorization/pom.xml index e75302be..85042753 100644 --- a/google-cloud-binary-authorization/pom.xml +++ b/google-cloud-binary-authorization/pom.xml @@ -71,11 +71,6 @@ io.grafeas grafeas - - io.perfmark - perfmark-api - 0.25.0 - diff --git a/pom.xml b/pom.xml index 33ef605e..359c894e 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,11 @@ grafeas 2.2.4 - + + io.perfmark + perfmark-api + 0.25.0 + com.google.cloud google-cloud-shared-dependencies