From 5c1aa3469414b3193cf9ae831452015635e23f60 Mon Sep 17 00:00:00 2001
From: mbalassi <mbalassi@apache.org>
Date: Tue, 16 Jun 2015 15:16:28 +0200
Subject: [PATCH] [build] merge transitive notice files to shaded notices

This closes #837.
---
 flink-dist/pom.xml                                            | 1 +
 flink-shaded-hadoop/pom.xml                                   | 1 +
 .../flink-streaming-connectors/flink-connector-flume/pom.xml  | 4 ++++
 .../flink-connector-twitter/pom.xml                           | 3 +++
 flink-yarn-tests/pom.xml                                      | 3 +++
 5 files changed, 12 insertions(+)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 6b23f96a6c9..d95425119d2 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -334,6 +334,7 @@ under the License.
 								</transformer>
 								<!-- The service transformer is needed to merge META-INF/services files -->
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
 							</transformers>
 						</configuration>
 					</execution>
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 60d81abe2d3..51c428a533a 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -84,6 +84,7 @@ under the License.
 							<transformers>
 								<!-- The service transformer is needed to merge META-INF/services files -->
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
 							</transformers>
 							<relocations>
 								<relocation>
diff --git a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-flume/pom.xml b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-flume/pom.xml
index 9ed97771e79..76823a2e1e5 100644
--- a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-flume/pom.xml
+++ b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-flume/pom.xml
@@ -147,6 +147,7 @@ under the License.
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<!-- Override artifactSet configuration to build fat-jar with all dependencies packed. -->
 				<groupId>org.apache.maven.plugins</groupId>
@@ -162,6 +163,9 @@ under the License.
 									<include>org.apache.flume:*</include>
 								</includes>
 							</artifactSet>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+							</transformers>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-twitter/pom.xml b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-twitter/pom.xml
index 871741ed3bd..5b9d296d636 100644
--- a/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-twitter/pom.xml
+++ b/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-twitter/pom.xml
@@ -86,6 +86,9 @@ under the License.
 									<include>com.twitter:joauth</include>
 								</includes>
 							</artifactSet>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+							</transformers>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index fcc5b87af71..4931d8dd248 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -170,6 +170,9 @@ under the License.
 									<shadedPattern>org.apache.flink.hadoop.shaded.org.jboss.netty</shadedPattern>
 								</relocation>
 							</relocations>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+							</transformers>
 						</configuration>
 					</execution>
 				</executions>
-- 
GitLab