Skip to content

Commit 8bdfb15

Browse files
simenliuxingsimenliuxing
committed
Merge branch '1.8.0_kafka_use_shade' into 'v1.8.0_dev'
 kafka use shade class See merge request !132
2 parents d378fc3 + c0775b8 commit 8bdfb15

File tree

7 files changed

+80
-48
lines changed

7 files changed

+80
-48
lines changed

‎core/pom.xml‎

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.package.name>core</project.package.name>
2020
<calcite.server.version>1.16.0</calcite.server.version>
21+
<jackson.version>2.7.9</jackson.version>
22+
<guava.version>19.0</guava.version>
2123
</properties>
2224

2325
<dependencies>
@@ -52,12 +54,6 @@
5254
<version>${flink.version}</version>
5355
</dependency>
5456

55-
<!--<dependency>
56-
<groupId>org.apache.flink</groupId>
57-
<artifactId>flink-table_2.11</artifactId>
58-
<version>1.7.2</version>
59-
</dependency>-->
60-
6157
<dependency>
6258
<groupId>org.apache.flink</groupId>
6359
<artifactId>flink-table-planner_2.11</artifactId>
@@ -75,6 +71,24 @@
7571
<artifactId>calcite-server</artifactId>
7672
<!-- When updating the Calcite version, make sure to update the dependency exclusions -->
7773
<version>${calcite.server.version}</version>
74+
<exclusions>
75+
<exclusion>
76+
<artifactId>jackson-databind</artifactId>
77+
<groupId>com.fasterxml.jackson.core</groupId>
78+
</exclusion>
79+
</exclusions>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>com.fasterxml.jackson.core</groupId>
84+
<artifactId>jackson-databind</artifactId>
85+
<version>${jackson.version}</version>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>com.google.guava</groupId>
90+
<artifactId>guava</artifactId>
91+
<version>${guava.version}</version>
7892
</dependency>
7993

8094
<dependency>
@@ -108,21 +122,39 @@
108122
<plugins>
109123
<plugin>
110124
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-jar-plugin</artifactId>
112-
<configuration>
113-
<classesDirectory>target/classes/</classesDirectory>
114-
<archive>
115-
<manifest>
116-
<!-- 主函数的入口 -->
117-
<mainClass>com.dtstack.flink.sql.Main</mainClass>
118-
<!-- 打包时 MANIFEST.MF文件不记录的时间戳版本 -->
119-
<useUniqueVersions>false</useUniqueVersions>
120-
</manifest>
121-
<manifestEntries>
122-
<Class-Path>.</Class-Path>
123-
</manifestEntries>
124-
</archive>
125-
</configuration>
125+
<artifactId>maven-shade-plugin</artifactId>
126+
<version>3.1.0</version>
127+
<executions>
128+
<execution>
129+
<phase>package</phase>
130+
<goals>
131+
<goal>shade</goal>
132+
</goals>
133+
<configuration>
134+
<transformers>
135+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
136+
<mainClass>com.dtstack.flink.sql.Main</mainClass>
137+
</transformer>
138+
</transformers>
139+
<artifactSet>
140+
<includes>
141+
<include>com.fasterxml.jackson.*</include>
142+
<include>com.google.guava</include>
143+
</includes>
144+
</artifactSet>
145+
<filters>
146+
<filter>
147+
<artifact>*:*</artifact>
148+
<excludes>
149+
<exclude>META-INF/*.SF</exclude>
150+
<exclude>META-INF/*.DSA</exclude>
151+
<exclude>META-INF/*.RSA</exclude>
152+
</excludes>
153+
</filter>
154+
</filters>
155+
</configuration>
156+
</execution>
157+
</executions>
126158
</plugin>
127159

128160
<plugin>

‎kafka09/kafka09-sink/src/main/java/com/dtstack/flink/sql/sink/kafka/CustomerJsonRowSerializationSchema.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import org.apache.flink.formats.json.JsonRowDeserializationSchema;
2828
import org.apache.flink.formats.json.JsonRowSchemaConverter;
2929
import org.apache.flink.metrics.Counter;
30-
import com.fasterxml.jackson.databind.JsonNode;
31-
import com.fasterxml.jackson.databind.ObjectMapper;
32-
import com.fasterxml.jackson.databind.node.ArrayNode;
33-
import com.fasterxml.jackson.databind.node.ContainerNode;
34-
import com.fasterxml.jackson.databind.node.ObjectNode;
30+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
31+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
32+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
33+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ContainerNode;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
3535
import org.apache.flink.types.Row;
3636
import org.apache.flink.util.Preconditions;
3737

‎kafka09/kafka09-source/src/main/java/com/dtstack/flink/sql/source/kafka/CustomerJsonDeserialization.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
import com.dtstack.flink.sql.source.AbsDeserialization;
2525
import com.dtstack.flink.sql.source.kafka.metric.KafkaTopicPartitionLagMetric;
2626
import com.dtstack.flink.sql.table.TableInfo;
27-
import com.fasterxml.jackson.databind.node.ArrayNode;
27+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
2828
import org.apache.flink.api.common.typeinfo.TypeInformation;
2929
import org.apache.flink.api.common.typeinfo.Types;
3030
import org.apache.flink.api.java.typeutils.RowTypeInfo;
3131
import com.google.common.base.Strings;
3232
import org.apache.flink.metrics.MetricGroup;
3333
import com.google.common.collect.Maps;
34-
import com.fasterxml.jackson.core.JsonProcessingException;
35-
import com.fasterxml.jackson.databind.JsonNode;
36-
import com.fasterxml.jackson.databind.ObjectMapper;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
35+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
36+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
3737
import org.apache.flink.streaming.connectors.kafka.internal.KafkaConsumerThread;
3838
import org.apache.flink.streaming.connectors.kafka.internals.AbstractFetcher;
3939
import org.apache.flink.types.Row;

‎kafka10/kafka10-sink/src/main/java/com/dtstack/flink/sql/sink/kafka/CustomerJsonRowSerializationSchema.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import org.apache.flink.formats.json.JsonRowDeserializationSchema;
2828
import org.apache.flink.formats.json.JsonRowSchemaConverter;
2929
import org.apache.flink.metrics.Counter;
30-
import com.fasterxml.jackson.databind.JsonNode;
31-
import com.fasterxml.jackson.databind.ObjectMapper;
32-
import com.fasterxml.jackson.databind.node.ArrayNode;
33-
import com.fasterxml.jackson.databind.node.ContainerNode;
34-
import com.fasterxml.jackson.databind.node.ObjectNode;
30+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
31+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
32+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
33+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ContainerNode;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
3535
import org.apache.flink.types.Row;
3636
import org.apache.flink.util.Preconditions;
3737

‎kafka10/kafka10-source/src/main/java/com/dtstack/flink/sql/source/kafka/CustomerJsonDeserialization.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import com.google.common.base.Strings;
3131
import org.apache.flink.metrics.MetricGroup;
3232
import com.google.common.collect.Maps;
33-
import com.fasterxml.jackson.core.JsonProcessingException;
34-
import com.fasterxml.jackson.databind.JsonNode;
35-
import com.fasterxml.jackson.databind.ObjectMapper;
36-
import com.fasterxml.jackson.databind.node.ArrayNode;
33+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
35+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
36+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
3737
import org.apache.flink.streaming.connectors.kafka.internal.KafkaConsumerThread;
3838
import org.apache.flink.streaming.connectors.kafka.internals.AbstractFetcher;
3939
import org.apache.flink.types.Row;

‎kafka11/kafka11-sink/src/main/java/com/dtstack/flink/sql/sink/kafka/CustomerJsonRowSerializationSchema.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import org.apache.flink.formats.json.JsonRowDeserializationSchema;
2929
import org.apache.flink.formats.json.JsonRowSchemaConverter;
3030
import org.apache.flink.metrics.Counter;
31-
import com.fasterxml.jackson.databind.JsonNode;
32-
import com.fasterxml.jackson.databind.ObjectMapper;
33-
import com.fasterxml.jackson.databind.node.ArrayNode;
34-
import com.fasterxml.jackson.databind.node.ContainerNode;
35-
import com.fasterxml.jackson.databind.node.ObjectNode;
31+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
32+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
33+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ContainerNode;
35+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
3636
import org.apache.flink.types.Row;
3737
import org.apache.flink.util.Preconditions;
3838

‎kafka11/kafka11-source/src/main/java/com/dtstack/flink/sql/source/kafka/CustomerJsonDeserialization.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import com.google.common.base.Strings;
3131
import org.apache.flink.metrics.MetricGroup;
3232
import com.google.common.collect.Maps;
33-
import com.fasterxml.jackson.core.JsonProcessingException;
34-
import com.fasterxml.jackson.databind.JsonNode;
35-
import com.fasterxml.jackson.databind.ObjectMapper;
36-
import com.fasterxml.jackson.databind.node.ArrayNode;
33+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
34+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
35+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
36+
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
3737
import org.apache.flink.streaming.connectors.kafka.internal.KafkaConsumerThread;
3838
import org.apache.flink.streaming.connectors.kafka.internals.AbstractFetcher;
3939
import org.apache.flink.types.Row;

0 commit comments

Comments
 (0)