[build] merge transitive notice files to shaded notices

This closes apache#837.
nltran · Jun 16, 2015 · 5c1aa34 · 5c1aa34
1 parent 7240c7a
commit 5c1aa34
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>