You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2016/02/04 15:24:03 UTC
flink git commit: [FLINK-3328] Incorrectly shaded dependencies in
flink-runtime
Repository: flink
Updated Branches:
refs/heads/master aabb2688a -> 7378f014b
[FLINK-3328] Incorrectly shaded dependencies in flink-runtime
This closes #1584
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7378f014
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7378f014
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7378f014
Branch: refs/heads/master
Commit: 7378f014bbb3f99dbe73697926aff485d399be5a
Parents: aabb268
Author: Robert Metzger <rm...@apache.org>
Authored: Thu Feb 4 12:20:20 2016 +0100
Committer: Robert Metzger <rm...@apache.org>
Committed: Thu Feb 4 15:23:38 2016 +0100
----------------------------------------------------------------------
flink-runtime/pom.xml | 1 +
flink-shaded-curator/flink-shaded-curator-recipes/pom.xml | 9 +++++----
flink-shaded-curator/pom.xml | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7378f014/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 2657bf1..d8693e7 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -410,6 +410,7 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
+
<artifactSet>
<includes combine.children="append">
<include>org.apache.flink:flink-shaded-curator-recipes</include>
http://git-wip-us.apache.org/repos/asf/flink/blob/7378f014/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
index 91bf18f..81b812c 100644
--- a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
+++ b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
@@ -64,10 +64,11 @@ under the License.
</goals>
<configuration>
<artifactSet combine.self="override">
- <excludes>
- <exclude>log4j</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- </excludes>
+ <includes>
+ <include>com.google.guava:*</include>
+ <include>org.ow2.asm:*</include>
+ <include>org.apache.curator:*</include>
+ </includes>
</artifactSet>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/flink/blob/7378f014/flink-shaded-curator/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/pom.xml b/flink-shaded-curator/pom.xml
index 8408b0f..2d1972c 100644
--- a/flink-shaded-curator/pom.xml
+++ b/flink-shaded-curator/pom.xml
@@ -29,7 +29,7 @@
</parent>
<modules>
- <module>flink-shaded-curator-recipes</module>
+ <module>flink-shaded-curator-recipes</module>
<module>flink-shaded-curator-test</module>
</modules>