From 4b478b0fc21d31472939dceece4ba059a8a0ea16 Mon Sep 17 00:00:00 2001
From: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Date: Wed, 22 Apr 2020 15:49:58 -0400
Subject: [PATCH] deps: fix build errors (#286)

* deps: fix build errors

* temporarily remove flatten plugin

* add flatten back, specify javax version

* specify javax version in parent pom
---
 google-cloud-bigquery/pom.xml | 2 ++
 pom.xml                       | 5 -----
 samples/snapshot/pom.xml      | 5 +++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index fa654776b..f3207f720 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -157,6 +157,8 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <!-- 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 4524caeff..f3fbd6eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,11 +161,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>
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 -->