From 58eda23a713b301f8776d904b52353ec07739429 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 15 Apr 2020 12:36:55 -0400
Subject: [PATCH 1/3] feat: add flatten plugin

---
 google-cloud-bigquery/pom.xml | 4 ++++
 pom.xml                       | 2 +-
 samples/snapshot/pom.xml      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index f8624c509..3b50060ce 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -140,6 +140,10 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 91d103c1f..ca00cf03b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     <grpc.version>1.28.1</grpc.version>
     <protobuf.version>3.11.4</protobuf.version>
     <junit.version>4.13</junit.version>
-    <guava.version>28.2-android</guava.version>
+    <guava.version>29.0-android</guava.version>
     <threeten.version>1.4.3</threeten.version>
     <javax.annotations.version>1.3.2</javax.annotations.version>
     <animal-sniffer.version>1.18</animal-sniffer.version>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2c72316ea..474d81c47 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
-      <version>1.110.1</version>
+      <version>1.110.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Test dependencies -->

From a14eee172bc306677e718c0994e665b68ea5bd73 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 15 Apr 2020 17:00:55 -0400
Subject: [PATCH 2/3] fix version replace tag

---
 samples/snapshot/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 474d81c47..021b92ea6 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -39,12 +39,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <!-- {x-version-update-start::current} -->
   <dependencies>
+    <!-- {x-version-update-start::current} -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
-      <version>1.110.2-SNAPSHOT</version>
+      <version>1.110.1</version>
     </dependency>
 
     <!-- Test dependencies -->

From 1af22a94a13d3abe689fd64d67ef3839e78c33ce Mon Sep 17 00:00:00 2001
From: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Date: Wed, 15 Apr 2020 17:17:17 -0400
Subject: [PATCH 3/3] update version update tag

Co-Authored-By: Jeff Ching <chingor@google.com>
---
 samples/snapshot/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 021b92ea6..386ade29f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -40,7 +40,7 @@
   </properties>
 
   <dependencies>
-    <!-- {x-version-update-start::current} -->
+    <!-- {x-version-update-start:google-cloud-bigquery:current} -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
@@ -97,4 +97,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>