Repository: flink Updated Branches: refs/heads/master 114da93f6 -> 7978a1744
[FLINK-7993][kafka] Sync curator shading patterns This closes #4953. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7978a174 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7978a174 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7978a174 Branch: refs/heads/master Commit: 7978a174474fed8a3d8e6eecfdc13bb129745893 Parents: 114da93 Author: zentol <[email protected]> Authored: Mon Nov 6 12:47:27 2017 +0100 Committer: zentol <[email protected]> Committed: Mon Nov 6 15:44:47 2017 +0100 ---------------------------------------------------------------------- flink-connectors/flink-connector-kafka-0.8/pom.xml | 8 ++------ flink-runtime/pom.xml | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7978a174/flink-connectors/flink-connector-kafka-0.8/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml index c9a1770..2b2fc34 100644 --- a/flink-connectors/flink-connector-kafka-0.8/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml @@ -213,15 +213,11 @@ under the License. <goal>shade</goal> </goals> <configuration> - <artifactSet> - <includes combine.children="append"> - <include>org.apache.flink:flink-shaded-curator</include> - </includes> - </artifactSet> <relocations combine.children="append"> <relocation> <pattern>org.apache.curator</pattern> - <shadedPattern>org.apache.flink.shaded.org.apache.curator</shadedPattern> + <!-- IMPORTANT: This must be kept in sync with flink-runtime --> + <shadedPattern>org.apache.flink.shaded.curator.org.apache.curator</shadedPattern> </relocation> </relocations> </configuration> http://git-wip-us.apache.org/repos/asf/flink/blob/7978a174/flink-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 8e82d74..f28bf33 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -454,6 +454,7 @@ under the License. </relocation> <relocation> <pattern>org.apache.curator</pattern> + <!-- IMPORTANT: This must be kept in sync with flink-connector-kafka-0.8 --> <shadedPattern>org.apache.flink.shaded.curator.org.apache.curator</shadedPattern> <excludes> <!-- Do not relocate curator-test. This leads to problems for downstream
