flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [4/9] flink git commit: [FLINK-3458] [build] Disable shade-flink execution in flink-shaded-hadoop
Date Tue, 23 Feb 2016 14:21:47 GMT
[FLINK-3458] [build] Disable shade-flink execution in flink-shaded-hadoop

The shade-flink execution of the parent pom caused the problem that the guava
dependencies were relocated twice in the flink-shaded-hadoop jar. In order to
avoid this, this patch disables the shade-flink execution.

This closes #1681.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b204888f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b204888f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b204888f

Branch: refs/heads/master
Commit: b204888fd1c40938568ce8243f5bd5b44491d8e0
Parents: 407c285
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Wed Feb 17 14:59:16 2016 +0100
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Tue Feb 23 15:20:07 2016 +0100

----------------------------------------------------------------------
 flink-shaded-hadoop/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/b204888f/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index d5a8529..1920737 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -63,6 +63,12 @@ under the License.
 				<artifactId>maven-shade-plugin</artifactId>
 				<executions>
 					<execution>
+						<!--Disable shade-flink execution to avoid duplicate relocation of
+						dependencies-->
+						<id>shade-flink</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
 						<id>shade-hadoop</id>
 						<phase>package</phase>
 						<goals>


Mime
View raw message