This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit 80befaf1a8fd1613400df1a796efba877957434f Author: zentol <[email protected]> AuthorDate: Wed Dec 12 13:40:00 2018 +0100 [FLINK-11022] Define transformers in parent pom --- flink-shaded-asm-5/pom.xml | 11 ----------- flink-shaded-asm-6/pom.xml | 11 ----------- flink-shaded-guava-18/pom.xml | 11 ----------- flink-shaded-jackson-parent/pom.xml | 11 ----------- flink-shaded-netty-4/pom.xml | 11 ----------- pom.xml | 10 ++++++++++ 6 files changed, 10 insertions(+), 55 deletions(-) diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml index e2f2b96..f129faa 100644 --- a/flink-shaded-asm-5/pom.xml +++ b/flink-shaded-asm-5/pom.xml @@ -73,17 +73,6 @@ under the License. <shadedPattern>org.apache.flink.shaded.asm5.org.objectweb</shadedPattern> </relocation> </relocations> - <transformers> - <!-- The service transformer is needed to merge META-INF/services files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - </transformers> </configuration> </execution> </executions> diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-6/pom.xml index 04f9a1c..099f52b 100644 --- a/flink-shaded-asm-6/pom.xml +++ b/flink-shaded-asm-6/pom.xml @@ -87,17 +87,6 @@ under the License. <shadedPattern>org.apache.flink.shaded.asm6.org.objectweb</shadedPattern> </relocation> </relocations> - <transformers> - <!-- The service transformer is needed to merge META-INF/services files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - </transformers> </configuration> </execution> </executions> diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml index 1921e7f..a5b70cd 100644 --- a/flink-shaded-guava-18/pom.xml +++ b/flink-shaded-guava-18/pom.xml @@ -73,17 +73,6 @@ under the License. <shadedPattern>org.apache.flink.shaded.guava18.com.google</shadedPattern> </relocation> </relocations> - <transformers> - <!-- The service transformer is needed to merge META-INF/services files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - </transformers> </configuration> </execution> </executions> diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml index b536b8f..f0eacf0 100644 --- a/flink-shaded-jackson-parent/pom.xml +++ b/flink-shaded-jackson-parent/pom.xml @@ -89,17 +89,6 @@ under the License. <shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml.jackson</shadedPattern> </relocation> </relocations> - <transformers> - <!-- The service transformer is needed to merge META-INF/services files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - </transformers> </configuration> </execution> </executions> diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml index 65f35fa..eb244a3 100644 --- a/flink-shaded-netty-4/pom.xml +++ b/flink-shaded-netty-4/pom.xml @@ -71,17 +71,6 @@ under the License. <shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern> </relocation> </relocations> - <transformers> - <!-- The service transformer is needed to merge META-INF/services files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> - <!-- The ApacheLicenseResourceTransformer prevents duplicate Apache Licenses --> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - </transformers> </configuration> </execution> </executions> diff --git a/pom.xml b/pom.xml index b607a07..1dfe053 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,16 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>3.0.0</version> + <configuration> + <transformers> + <!-- The service transformer is needed to merge META-INF/services files --> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <!-- The ApacheNoticeResourceTransformer collects and aggregates NOTICE files --> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> + <projectName>Apache Flink-shaded</projectName> + </transformer> + </transformers> + </configuration> </plugin> </plugins> </pluginManagement>
