Skip to content

Commit 53341b4

Browse files
update synth
move flatten to pluginManagement
1 parent e093143 commit 53341b4

File tree

8 files changed

+39
-1510
lines changed

8 files changed

+39
-1510
lines changed

google-cloud-bigquerystorage/.flattened-pom.xml

Lines changed: 0 additions & 1194 deletions
This file was deleted.

google-cloud-bigquerystorage/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
</extension>
2626
</extensions>
2727
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
2832
<plugin>
2933
<groupId>com.google.protobuf.tools</groupId>
3034
<artifactId>maven-protoc-plugin</artifactId>

pom.xml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -235,42 +235,42 @@
235235
<ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
236236
</configuration>
237237
</plugin>
238+
239+
<!-- flatten maven plugin -->
240+
<plugin>
241+
<groupId>org.codehaus.mojo</groupId>
242+
<artifactId>flatten-maven-plugin</artifactId>
243+
<version>1.2.2-SNAPSHOT</version>
244+
<executions>
245+
<!-- enable flattening -->
246+
<execution>
247+
<id>flatten</id>
248+
<phase>process-resources</phase>
249+
<goals>
250+
<goal>flatten</goal>
251+
</goals>
252+
</execution>
253+
<!-- ensure proper cleanup -->
254+
<execution>
255+
<id>flatten.clean</id>
256+
<phase>clean</phase>
257+
<goals>
258+
<goal>clean</goal>
259+
</goals>
260+
</execution>
261+
</executions>
262+
<configuration>
263+
<flattenMode>oss</flattenMode>
264+
<flattenDependencyMode>all</flattenDependencyMode>
265+
<pomElements>
266+
<build>remove</build>
267+
</pomElements>
268+
</configuration>
269+
</plugin>
238270
</plugins>
239271
</pluginManagement>
240272

241273
<plugins>
242-
<!-- flatten maven plugin -->
243-
<plugin>
244-
<groupId>org.codehaus.mojo</groupId>
245-
<artifactId>flatten-maven-plugin</artifactId>
246-
<version>1.2.2-SNAPSHOT</version>
247-
<executions>
248-
<!-- enable flattening -->
249-
<execution>
250-
<id>flatten</id>
251-
<phase>process-resources</phase>
252-
<goals>
253-
<goal>flatten</goal>
254-
</goals>
255-
</execution>
256-
<!-- ensure proper cleanup -->
257-
<execution>
258-
<id>flatten.clean</id>
259-
<phase>clean</phase>
260-
<goals>
261-
<goal>clean</goal>
262-
</goals>
263-
</execution>
264-
</executions>
265-
<configuration>
266-
<flattenMode>oss</flattenMode>
267-
<flattenDependencyMode>all</flattenDependencyMode>
268-
<pomElements>
269-
<build>remove</build>
270-
</pomElements>
271-
</configuration>
272-
</plugin>
273-
274274
<!-- ban duplicate class -->
275275
<plugin>
276276
<groupId>org.apache.maven.plugins</groupId>

samples/install-without-bom/pom.xml

Lines changed: 0 additions & 84 deletions
This file was deleted.

samples/pom.xml

Lines changed: 0 additions & 56 deletions
This file was deleted.

samples/snapshot/pom.xml

Lines changed: 0 additions & 83 deletions
This file was deleted.

samples/snippets/pom.xml

Lines changed: 0 additions & 60 deletions
This file was deleted.

synth.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,6 @@
3434
destination_name='bigquerystorage',
3535
)
3636

37-
java.common_templates()
37+
java.common_templates(excludes=[
38+
'samples/*'
39+
])

0 commit comments

Comments
 (0)