feat: add flatten plugin to client and proto modules (#108)

googleapis · Apr 24, 2020 · fb3566d · fb3566d
1 parent df23adf
commit fb3566d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ target/
 *.iml
 __pycache__/
 
+.flattened-pom.xml
diff --git 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
@@ -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
@@ -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>