From fb3566d31600b9ed629a2daa46c5202a894181b2 Mon Sep 17 00:00:00 2001
From: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:25:10 -0400
Subject: [PATCH] feat: add flatten plugin to client and proto modules (#108)

---
 .gitignore                              |  1 +
 google-cloud-datastore/pom.xml          |  9 +++++++++
 pom.xml                                 |  6 ------
 proto-google-cloud-datastore-v1/pom.xml | 11 +++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79dd1e39e..6f5e4424d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ target/
 *.iml
 __pycache__/
 
+.flattened-pom.xml
\ No newline at end of file
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 17d8745a8..0f4ad9636 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -97,4 +97,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 67d44f993..4881caa69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,17 +253,11 @@
         <artifactId>google-oauth-client</artifactId>
         <version>1.30.6</version>
       </dependency>
-
       <dependency>
         <groupId>org.threeten</groupId>
         <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>junit</groupId>
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 1a7d2cebf..1292a9f98 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -24,6 +24,16 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>java9</id>
@@ -34,6 +44,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>