Skip to content

Commit

Permalink
upgrade jackson and fix shaded relocations
Browse files Browse the repository at this point in the history 
Signed-off-by: chenxu <[email protected]>
  • Loading branch information
@dmetasoul01
dmetasoul01 committed Aug 2, 2024
1 parent 7afe8af commit f903387
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 16 deletions.
61 changes: 57 additions & 4 deletions lakesoul-flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ SPDX-License-Identifier: Apache-2.0
<groupId>org.apache.flink</groupId>
<artifactId>flink-formats</artifactId>
<version>${flink.version}</version>
<scope>${local.scope}</scope>
<type>pom</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -130,6 +131,7 @@ SPDX-License-Identifier: Apache-2.0
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-sqlserver-cdc</artifactId>
<version>${cdc.version}</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
Expand All @@ -140,36 +142,43 @@ SPDX-License-Identifier: Apache-2.0
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-oracle-cdc</artifactId>
<version>${cdc.version}</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-postgres-cdc</artifactId>
<version>${cdc.version}</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-mongodb-cdc</artifactId>
<version>${cdc.version}</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-mongodb</artifactId>
<version>1.0.1-1.17</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
<version>4.3.4</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>flink-doris-connector-1.17</artifactId>
<version>1.5.0</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc</artifactId>
<version>3.1.1-1.17</version>
<scope>${local.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
Expand Down Expand Up @@ -413,10 +422,6 @@ SPDX-License-Identifier: Apache-2.0
<includes>
<include>com.dmetasoul:lakesoul-flink</include>
<include>com.ververica:flink-sql-connector-mysql-cdc</include>
<include>com.ververica:flink-sql-connector-postgres-cdc</include>
<include>com.ververica:flink-sql-connector-oracle-cdc</include>
<include>org.apache.flink:flink-connector-jdbc</include>
<include>org.apache.flink:flink-doris-connector-1.17</include>
<include>com.dmetasoul:lakesoul-common</include>
<include>com.dmetasoul:lakesoul-io-java</include>
<include>com.github.jnr:*</include>
Expand Down Expand Up @@ -554,10 +559,58 @@ SPDX-License-Identifier: Apache-2.0
<pattern>shaded.parquet</pattern>
<shadedPattern>com.lakesoul.shaded.shaded.parquet</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>com.lakesoul.shaded.com.fasterxml.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>org.json4s</pattern>
<shadedPattern>com.lakesoul.shaded.org.json4s</shadedPattern>
</relocation>
<relocation>
<pattern>dev.failsafe</pattern>
<shadedPattern>com.lakesoul.shaded.dev.failsafe</shadedPattern>
</relocation>
<relocation>
<pattern>org.aspectj</pattern>
<shadedPattern>com.lakesoul.shaded.org.aspectj</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>com.lakesoul.shaded.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>com.lakesoul.shaded.org.yaml.snakeyaml</shadedPattern>
</relocation>
<relocation>
<pattern>org.antlr</pattern>
<shadedPattern>com.lakesoul.shaded.org.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>io.substrait</pattern>
<shadedPattern>com.lakesoul.shaded.io.substrait</shadedPattern>
</relocation>
<relocation>
<pattern>org.stringtemplate</pattern>
<shadedPattern>com.lakesoul.shaded.org.stringtemplate</shadedPattern>
</relocation>
<relocation>
<pattern>org.abego</pattern>
<shadedPattern>com.lakesoul.shaded.org.abego</shadedPattern>
</relocation>
<relocation>
<pattern>org.antlr</pattern>
<shadedPattern>com.lakesoul.shaded.org.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>org.ow2.asm</pattern>
<shadedPattern>com.lakesoul.shaded.org.ow2.asm</shadedPattern>
</relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
<shadedPattern>com.lakesoul.shaded.org.objectweb.asm</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer
Expand Down
5 changes: 5 additions & 0 deletions lakesoul-presto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>3.3.2</version>
</dependency>
</dependencies>

<build>
Expand Down
74 changes: 72 additions & 2 deletions lakesoul-spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ SPDX-License-Identifier: Apache-2.0
<groupId>com.dmetasoul</groupId>
<artifactId>lakesoul-common</artifactId>
<version>${revision}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.dmetasoul</groupId>
Expand All @@ -84,6 +90,10 @@ SPDX-License-Identifier: Apache-2.0
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -211,7 +221,7 @@ SPDX-License-Identifier: Apache-2.0
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -226,6 +236,10 @@ SPDX-License-Identifier: Apache-2.0
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -284,7 +298,7 @@ SPDX-License-Identifier: Apache-2.0
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
<version>3.3.3</version>
<version>3.3.6</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -536,10 +550,66 @@ SPDX-License-Identifier: Apache-2.0
<pattern>org.apache.arrow.vector</pattern>
<shadedPattern>io.glutenproject.shaded.org.apache.arrow.vector</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>com.lakesoul.shaded.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>com.lakesoul.shaded.com.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>com.lakesoul.shaded.com.fasterxml.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>org.json4s</pattern>
<shadedPattern>com.lakesoul.shaded.org.json4s</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>com.lakesoul.shaded.org.apache.commons</shadedPattern>
</relocation>
<relocation>
<pattern>dev.failsafe</pattern>
<shadedPattern>com.lakesoul.shaded.dev.failsafe</shadedPattern>
</relocation>
<relocation>
<pattern>org.aspectj</pattern>
<shadedPattern>com.lakesoul.shaded.org.aspectj</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>com.lakesoul.shaded.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>com.lakesoul.shaded.org.yaml.snakeyaml</shadedPattern>
</relocation>
<relocation>
<pattern>org.antlr</pattern>
<shadedPattern>com.lakesoul.shaded.org.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>io.substrait</pattern>
<shadedPattern>com.lakesoul.shaded.io.substrait</shadedPattern>
</relocation>
<relocation>
<pattern>org.stringtemplate</pattern>
<shadedPattern>com.lakesoul.shaded.org.stringtemplate</shadedPattern>
</relocation>
<relocation>
<pattern>org.abego</pattern>
<shadedPattern>com.lakesoul.shaded.org.abego</shadedPattern>
</relocation>
<relocation>
<pattern>org.ow2.asm</pattern>
<shadedPattern>com.lakesoul.shaded.org.ow2.asm</shadedPattern>
</relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
<shadedPattern>com.lakesoul.shaded.org.objectweb.asm</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin>
Expand Down
Loading

0 comments on commit f903387

Please sign in to comment.