update synth

move flatten to pluginManagement
googleapis · Mar 24, 2020 · 53341b4 · 53341b4
1 parent e093143
commit 53341b4
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 1,510 deletions.
diff --git a/google-cloud-bigquerystorage/.flattened-pom.xml b/google-cloud-bigquerystorage/.flattened-pom.xml
diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml
@@ -25,6 +25,10 @@
       </extension>
     </extensions>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>com.google.protobuf.tools</groupId>
         <artifactId>maven-protoc-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -235,42 +235,42 @@
             <ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>
+
+        <!-- flatten maven plugin -->
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>flatten-maven-plugin</artifactId>
+          <version>1.2.2-SNAPSHOT</version>
+          <executions>
+            <!-- enable flattening -->
+            <execution>
+              <id>flatten</id>
+              <phase>process-resources</phase>
+              <goals>
+                <goal>flatten</goal>
+              </goals>
+            </execution>
+            <!-- ensure proper cleanup -->
+            <execution>
+              <id>flatten.clean</id>
+              <phase>clean</phase>
+              <goals>
+                <goal>clean</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <flattenMode>oss</flattenMode>
+            <flattenDependencyMode>all</flattenDependencyMode>
+            <pomElements>
+              <build>remove</build>
+            </pomElements>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
-      <!-- flatten maven plugin -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
-        <executions>
-          <!-- enable flattening -->
-          <execution>
-            <id>flatten</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>flatten</goal>
-            </goals>
-          </execution>
-          <!-- ensure proper cleanup -->
-          <execution>
-            <id>flatten.clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <flattenMode>oss</flattenMode>
-          <flattenDependencyMode>all</flattenDependencyMode>
-          <pomElements>
-            <build>remove</build>
-          </pomElements>
-        </configuration>
-      </plugin>
-
       <!-- ban duplicate class -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
diff --git a/samples/pom.xml b/samples/pom.xml
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
diff --git a/synth.py b/synth.py
@@ -34,4 +34,6 @@
       destination_name='bigquerystorage',
   )
 
-java.common_templates()
+java.common_templates(excludes=[
+    'samples/*'
+])