[FLINK-7993][kafka] Sync curator shading patterns

This closes apache#4953.
derekm · Nov 6, 2017 · 7978a17 · 7978a17
1 parent 114da93
commit 7978a17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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>

diff --git 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