From 81b3ec71f2fc0c388ff474356d0489204de57380 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 19 May 2022 21:20:06 +0000
Subject: [PATCH 1/2] 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 5d3a05e7..f0e8ec25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.10.0</version>
+        <version>2.12.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From d77b86ef3be77f05f61ba5df597ffd18c6dedb4e Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Mon, 23 May 2022 18:24:47 -0400
Subject: [PATCH 2/2] Override perfmark version to 0.25.0 to resolve dependency
 conflict.

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index f0e8ec25..75ee3e86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,11 @@
         <scope>import</scope>
       </dependency>
 
+      <dependency>
+        <groupId>io.perfmark</groupId>
+        <artifactId>perfmark-api</artifactId>
+        <version>0.25.0</version>
+      </dependency>
       <!-- TODO: This should maybe eventually be moved into this repo -->
       <dependency>
         <groupId>io.grafeas</groupId>