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 f6d00bc
Show file tree
Hide file tree
Showing 3 changed files with 221 additions and 10 deletions.
52 changes: 52 additions & 0 deletions lakesoul-flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,62 @@ 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>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.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
56 changes: 56 additions & 0 deletions lakesoul-spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,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
123 changes: 113 additions & 10 deletions native-io/lakesoul-io-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ SPDX-License-Identifier: Apache-2.0
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<arrow.version>12.0.0</arrow.version>
<arrow.version>15.0.2</arrow.version>
<scalatest.version>3.1.0</scalatest.version>
<substrait.version>0.28.0</substrait.version>
<substrait.version>0.37.0</substrait.version>
<protobuf.version>3.22.0</protobuf.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
</properties>
Expand All @@ -49,21 +49,67 @@ SPDX-License-Identifier: Apache-2.0
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
<version>${arrow.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<version>${arrow.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.112.Final</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-c-data</artifactId>
<version>${arrow.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- scala deps -->
Expand Down Expand Up @@ -129,6 +175,10 @@ SPDX-License-Identifier: Apache-2.0
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -608,12 +658,13 @@ SPDX-License-Identifier: Apache-2.0
</excludes>
</filter>
<filter>
<!-- 包含所有Scala相关资源 -->
<artifact>**/*scala*</artifact>
<includes>
<include>**/*.class</include>
<!-- 如果还有其他Scala相关的资源，比如*.sbt、*.scala等 -->
</includes>
<artifact>org.apache.spark:spark-core_2.12</artifact>
<excludes>
<exclude>org/sparkproject/jetty/**</exclude>
<exclude>META-INF/maven/org.eclipse.jetty/**</exclude>
<exclude>jetty-dir.css</exclude>
<exclude>META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder</exclude>
</excludes>
</filter>
</filters>
<relocations>
Expand All @@ -622,8 +673,12 @@ SPDX-License-Identifier: Apache-2.0
<shadedPattern>com.lakesoul.shaded.scala.</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.spark.sql</pattern>
<shadedPattern>com.lakesoul.shaded.org.apache.spark.sql</shadedPattern>
<pattern>com.zaxxer.hikari</pattern>
<shadedPattern>com.lakesoul.shaded.com.zaxxer.hikari</shadedPattern>
</relocation>
<relocation>
<pattern>org.postgresql</pattern>
<shadedPattern>com.lakesoul.shaded.org.postgresql</shadedPattern>
</relocation>
<relocation>
<pattern>org.ow2.asm</pattern>
Expand Down Expand Up @@ -665,6 +720,26 @@ SPDX-License-Identifier: Apache-2.0
<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>
Expand All @@ -673,6 +748,34 @@ SPDX-License-Identifier: Apache-2.0
<pattern>org.antlr</pattern>
<shadedPattern>com.lakesoul.shaded.org.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>com.lakesoul.shaded.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>com.alibaba.fastjson</pattern>
<shadedPattern>com.lakesoul.shaded.com.alibaba.fastjson</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.flatbuffers</pattern>
<shadedPattern>com.lakesoul.shaded.com.google.flatbuffers</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.spark</pattern>
<shadedPattern>com.lakesoul.shaded.org.apache.spark</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>
</relocations>
</configuration>
</plugin>
Expand Down

0 comments on commit f6d00bc

Please sign in to comment.