You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/06/17 00:43:20 UTC
flink git commit: [build] merge transitive notice files to shaded
notices
Repository: flink
Updated Branches:
refs/heads/master 7240c7adf -> 5c1aa3469
[build] merge transitive notice files to shaded notices
This closes #837.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5c1aa346
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5c1aa346
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5c1aa346
Branch: refs/heads/master
Commit: 5c1aa3469414b3193cf9ae831452015635e23f60
Parents: 7240c7a
Author: mbalassi <mb...@apache.org>
Authored: Tue Jun 16 15:16:28 2015 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Wed Jun 17 00:41:11 2015 +0200
----------------------------------------------------------------------
flink-dist/pom.xml | 1 +
flink-shaded-hadoop/pom.xml | 1 +
.../flink-streaming-connectors/flink-connector-flume/pom.xml | 4 ++++
.../flink-streaming-connectors/flink-connector-twitter/pom.xml | 3 +++
flink-yarn-tests/pom.xml | 3 +++
5 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5c1aa346/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 6b23f96..d954251 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/5c1aa346/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 60d81ab..51c428a 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/5c1aa346/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-flume/pom.xml
----------------------------------------------------------------------
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 9ed9777..76823a2 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/5c1aa346/flink-staging/flink-streaming/flink-streaming-connectors/flink-connector-twitter/pom.xml
----------------------------------------------------------------------
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 871741e..5b9d296 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/5c1aa346/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index fcc5b87..4931d8d 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>