From 6b0947b0c142691a16190b7d15da136936517e5a Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:22:49 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
 google-cloud-shared-dependencies (#259)

---
 .gitignore                           |  2 ++
 google-cloud-pubsub/pom.xml          |  9 ++++++---
 grpc-google-cloud-pubsub-v1/pom.xml  |  9 +++++++++
 pom.xml                              | 13 ++-----------
 proto-google-cloud-pubsub-v1/pom.xml |  9 +++++++++
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index be0ddcd12..dbde6a740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ api_key
 # Python utilities
 *.pyc
 artman-genfiles
+
+.flattened-pom.xml
diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml
index 747d66f87..63dffeb02 100644
--- a/google-cloud-pubsub/pom.xml
+++ b/google-cloud-pubsub/pom.xml
@@ -85,7 +85,6 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>${autovalue.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -163,11 +162,16 @@
             <path>
               <groupId>com.google.auto.value</groupId>
               <artifactId>auto-value</artifactId>
-              <version>${autovalue.version}</version>
+              <version>${auto-value-annotation.version}</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -181,7 +185,6 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
-          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml
index c9b16e11f..3ef0b0cff 100644
--- a/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/grpc-google-cloud-pubsub-v1/pom.xml
@@ -53,4 +53,13 @@
       </dependencies>
     </profile>
   </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f989230e3..bfac2b88c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-pubsub-parent</site.installationModule>
-    <easymock.version>4.2</easymock.version>
-    <javax.annotations.version>1.3.2</javax.annotations.version>
-    <errorprone.version>2.4.0</errorprone.version>
-    <autovalue.version>1.7.3</autovalue.version>
   </properties>
 
   <dependencyManagement>
@@ -95,15 +91,10 @@
         <version>1.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
       </dependency>
 
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${javax.annotations.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>${errorprone.version}</version>
+        <version>2.4.0</version>
       </dependency>
 
       <!-- Test dependencies -->
@@ -116,7 +107,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>${easymock.version}</version>
+        <version>4.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml
index 6ffdee4ce..82630be31 100644
--- a/proto-google-cloud-pubsub-v1/pom.xml
+++ b/proto-google-cloud-pubsub-v1/pom.xml
@@ -30,4 +30,13 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file