From 46b49aa29b3242e1b9c55bed3f8023f1b84b3e7c Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 22 Apr 2020 11:49:31 -0400
Subject: [PATCH 1/4] deps: fix build errors

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

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3ae14c0d1..af4473c3c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -46,6 +46,7 @@
       <artifactId>google-cloud-bigquery</artifactId>
       <version>1.111.1-SNAPSHOT</version>
     </dependency>
+    <!-- {x-version-update-end} -->
 
     <!-- Test dependencies -->
     <dependency>
@@ -57,10 +58,10 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.111.1-SNAPSHOT</version>
+      <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
-    <!-- {x-version-update-end} -->
+
   </dependencies>
 
   <!-- compile and run all snippet tests -->

From 18bc7d3a9f444bbb8389f58c549e1fd9f264ba3c Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 22 Apr 2020 13:27:46 -0400
Subject: [PATCH 2/4] temporarily remove flatten plugin

---
 google-cloud-bigquery/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index fa654776b..62ac4ff65 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -140,10 +140,10 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-      </plugin>
+<!--      <plugin>-->
+<!--        <groupId>org.codehaus.mojo</groupId>-->
+<!--        <artifactId>flatten-maven-plugin</artifactId>-->
+<!--      </plugin>-->
     </plugins>
   </build>
 

From 00da30ad7ed9eb58e11d9f0f322791c36506652a Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 22 Apr 2020 14:56:48 -0400
Subject: [PATCH 3/4] add flatten back, specify javax version

---
 google-cloud-bigquery/pom.xml | 9 +++++----
 pom.xml                       | 6 ------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 62ac4ff65..4fcc0b4f8 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -140,10 +140,10 @@
           </execution>
         </executions>
       </plugin>
-<!--      <plugin>-->
-<!--        <groupId>org.codehaus.mojo</groupId>-->
-<!--        <artifactId>flatten-maven-plugin</artifactId>-->
-<!--      </plugin>-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -157,6 +157,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 4524caeff..6e6b245b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@
     <junit.version>4.13</junit.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>
     <google-api-services-bigquery.version>v2-rev20200324-1.30.9
     </google-api-services-bigquery.version>
@@ -161,11 +160,6 @@
         <artifactId>threetenbp</artifactId>
         <version>${threeten.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${javax.annotations.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-annotations</artifactId>

From 0e1d9f0494b9b35df797c7d9abfadec922e07090 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Wed, 22 Apr 2020 15:40:47 -0400
Subject: [PATCH 4/4] specify javax version in parent pom

---
 google-cloud-bigquery/pom.xml | 3 ++-
 pom.xml                       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 4fcc0b4f8..f3207f720 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -157,7 +157,8 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
-          <version>1.3.2</version>
+          <!-- Adding version here because flatten cannot interpret this -->
+          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 6e6b245b0..f3fbd6eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
     <junit.version>4.13</junit.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>
     <google-api-services-bigquery.version>v2-rev20200324-1.30.9
     </google-api-services-bigquery.version>