You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2022/08/02 10:49:18 UTC
[flink-table-store] branch master updated: [FLINK-28775] Unclean shade in flink-table-store-dist
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git
The following commit(s) were added to refs/heads/master by this push:
new dfaa44cb [FLINK-28775] Unclean shade in flink-table-store-dist
dfaa44cb is described below
commit dfaa44cbc1b97ef00cb653569e60ae20280fd0ac
Author: Jingsong Lee <ji...@gmail.com>
AuthorDate: Tue Aug 2 18:48:22 2022 +0800
[FLINK-28775] Unclean shade in flink-table-store-dist
This closes #260
---
flink-table-store-dist/pom.xml | 55 ++++++++++++++++++----
flink-table-store-e2e-tests/pom.xml | 11 +++++
.../test/resources-filtered/docker-compose.yaml | 4 +-
3 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/flink-table-store-dist/pom.xml b/flink-table-store-dist/pom.xml
index f3966a2a..bcafa356 100644
--- a/flink-table-store-dist/pom.xml
+++ b/flink-table-store-dist/pom.xml
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>${flink.sql.connector.kafka}</artifactId>
+ <artifactId>${flink.connector.kafka}</artifactId>
<version>${flink.version}</version>
</dependency>
</dependencies>
@@ -105,7 +105,8 @@ under the License.
<include>org.apache.flink:flink-table-store-format</include>
<include>org.apache.flink:flink-table-store-hive-catalog</include>
<include>org.apache.flink:flink-table-store-kafka</include>
- <include>org.apache.flink:${flink.sql.connector.kafka}</include>
+ <include>org.apache.flink:${flink.connector.kafka}</include>
+ <include>org.apache.kafka:*</include>
</includes>
</artifactSet>
<filters>
@@ -133,11 +134,27 @@ under the License.
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>org.apache.kafka:*</artifact>
+ <excludes>
+ <exclude>kafka/kafka-version.properties</exclude>
+ <exclude>LICENSE</exclude>
+ <!-- Does not contain anything relevant.
+ Cites a binary dependency on jersey, but this is neither reflected in the
+ dependency graph, nor are any jersey files bundled. -->
+ <exclude>NOTICE</exclude>
+ <exclude>common/**</exclude>
+ </excludes>
+ </filter>
</filters>
<relocations>
+ <relocation>
+ <pattern>org.apache.flink.avro.shaded</pattern>
+ <shadedPattern>org.apache.flink.table.store.avro.shaded</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.flink.connector</pattern>
- <shadedPattern>org.apache.flink.table.store.shaded.org.apache.flink.connector</shadedPattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.connector</shadedPattern>
<excludes>
<exclude>org.apache.flink.connector.base.**</exclude>
<exclude>org.apache.flink.connector.file.**</exclude>
@@ -145,15 +162,35 @@ under the License.
</relocation>
<relocation>
<pattern>org.apache.flink.kafka</pattern>
- <shadedPattern>org.apache.flink.table.store.shaded.org.apache.flink.kafka</shadedPattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.kafka</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.flink.streaming.connectors.kafka</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.streaming.connectors.kafka</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.flink.streaming.util.serialization.JSONKeyValueDeserializationSchema</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.streaming.util.serialization.JSONKeyValueDeserializationSchema</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.flink.streaming.util.serialization.KeyedDeserializationSchema</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.streaming.util.serialization.KeyedDeserializationSchema</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.flink.streaming.util.serialization.KeyedSerializationSchema</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.streaming.util.serialization.KeyedSerializationSchema</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.flink.streaming.util.serialization.TypeInformationKeyValueSerializationSchema</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.streaming.util.serialization.TypeInformationKeyValueSerializationSchema</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</pattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</shadedPattern>
</relocation>
- <!--
- flink-sql-connector-kafka contains shaded kafka classes.
- As we've shaded kafka connector we also need to shade kafka dependencies.
- -->
<relocation>
<pattern>org.apache.kafka</pattern>
- <shadedPattern>org.apache.flink.table.store.shaded.org.apache.flink.kafka.shaded.org.apache.kafka</shadedPattern>
+ <shadedPattern>org.apache.flink.table.store.shaded.org.apache.kafka</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/flink-table-store-e2e-tests/pom.xml b/flink-table-store-e2e-tests/pom.xml
index 083e3f9a..b0f0665c 100644
--- a/flink-table-store-e2e-tests/pom.xml
+++ b/flink-table-store-e2e-tests/pom.xml
@@ -127,6 +127,17 @@ under the License.
<outputDirectory>/tmp/flink-table-store-e2e-tests-jars
</outputDirectory>
</artifactItem>
+ <!-- test table store with kafka sql jar -->
+ <artifactItem>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>${flink.sql.connector.kafka}</artifactId>
+ <version>${flink.version}</version>
+ <destFileName>flink-sql-connector-kafka.jar</destFileName>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>/tmp/flink-table-store-e2e-tests-jars
+ </outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</plugin>
diff --git a/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml b/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
index 0e273220..cb401ee8 100644
--- a/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
+++ b/flink-table-store-e2e-tests/src/test/resources-filtered/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
volumes:
- testdata:/test-data
- /tmp/flink-table-store-e2e-tests-jars:/jars
- entrypoint: /bin/bash -c "cp /jars/flink-table-store.jar /jars/bundled-hadoop.jar /opt/flink/lib && /docker-entrypoint.sh jobmanager"
+ entrypoint: /bin/bash -c "cp /jars/flink-table-store.jar /jars/bundled-hadoop.jar /jars/flink-sql-connector-kafka.jar /opt/flink/lib && /docker-entrypoint.sh jobmanager"
env_file:
- ./flink.env
networks:
@@ -44,7 +44,7 @@ services:
volumes:
- testdata:/test-data
- /tmp/flink-table-store-e2e-tests-jars:/jars
- entrypoint: /bin/bash -c "cp /jars/flink-table-store.jar /jars/bundled-hadoop.jar /opt/flink/lib && /docker-entrypoint.sh taskmanager"
+ entrypoint: /bin/bash -c "cp /jars/flink-table-store.jar /jars/bundled-hadoop.jar /jars/flink-sql-connector-kafka.jar /opt/flink/lib && /docker-entrypoint.sh taskmanager"
env_file:
- ./flink.env
networks: