From e256d22f33d5f091ea90ed81c0b0f8600beae96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Thu, 11 Jun 2020 13:54:53 +0200
Subject: [PATCH] fix: include an explicit version for javax-annotations-api
 (#261)

The Maven flatten plugin transforms the pom of the project from a set of imports
and transitive dependencies into a pom that contains all dependencies and versions
explicitly. This process did however miss the javax-annotations-api dependency that
is only included for JDK9 and higher.

Fixes https://github.com/GoogleCloudPlatform/java-docs-samples/issues/3139
---
 google-cloud-spanner-bom/pom.xml     | 2 +-
 google-cloud-spanner/pom.xml         | 1 +
 grpc-google-cloud-spanner-v1/pom.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 53e8fac348..ccb065a4af 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -90,7 +90,7 @@
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner</artifactId>
         <type>test-jar</type>
-        <version>1.55.1</version><!-- {x-version-update:google-cloud-spanner:current} -->
+        <version>1.55.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 9aec315b34..6bff001cfa 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -336,6 +336,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index ac288a3444..124d4db6cf 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
         </dependency>
       </dependencies>
     </profile>