build: enable flatten-maven-plugin for all artifacts (#225)

googleapis · May 20, 2020 · a39775f · a39775f
1 parent 8b14331
commit a39775f
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ target/
 .idea/
 *.iml
 __pycache__/
+
+.flattened-pom.xml
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
@@ -215,6 +215,15 @@
     </plugins>
   </reporting>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>java9</id>
@@ -225,6 +234,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>

diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -66,6 +66,14 @@
             </plugin>
         </plugins>
     </reporting>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <profiles>
         <profile>
@@ -77,6 +85,7 @@
                 <dependency>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
+                    <version>${javax.annotations.version}</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
@@ -62,6 +62,14 @@
             </plugin>
         </plugins>
     </reporting>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>java9</id>
@@ -72,6 +80,7 @@
                 <dependency>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
+                    <version>${javax.annotations.version}</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/grpc-google-cloud-firestore-v1beta1/pom.xml b/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -62,6 +62,14 @@
       </plugin>
     </plugins>
   </reporting>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>java9</id>
@@ -72,6 +80,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>

diff --git a/pom.xml b/pom.xml
@@ -247,11 +247,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>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>

diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml
@@ -33,6 +33,14 @@
             <artifactId>guava</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>java9</id>
@@ -43,6 +51,7 @@
                 <dependency>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
+                    <version>${javax.annotations.version}</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
@@ -33,6 +33,14 @@
             <artifactId>guava</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>java9</id>
@@ -43,6 +51,7 @@
                 <dependency>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
+                    <version>${javax.annotations.version}</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/proto-google-cloud-firestore-v1beta1/pom.xml b/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -33,6 +33,14 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>java9</id>
@@ -43,6 +51,7 @@
         <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
+          <version>${javax.annotations.version}</version>
         </dependency>
       </dependencies>
     </profile>