lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-3858] Shade javax.servlet for Spark bundle jar (#5295)

Browse Source 
Co-authored-by: yuezhang <yuezhang@freewheel.tv>
This commit is contained in:
YueZhang
2022-05-21 21:16:14 +08:00
committed by GitHub
parent b5adba3e55
commit 8ec625d4d5
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packaging/hudi-spark-bundle/pom.xml
View File

@@ -29,6 +29,7 @@
<properties> <properties>
<checkstyle.skip>true</checkstyle.skip> <checkstyle.skip>true</checkstyle.skip>
<main.basedir>${project.parent.basedir}</main.basedir> <main.basedir>${project.parent.basedir}</main.basedir>
<javax.servlet.version>3.1.0</javax.servlet.version>
</properties> </properties>
<build> <build>
@@ -80,6 +81,7 @@
<include>org.apache.hudi:hudi-timeline-service</include> <include>org.apache.hudi:hudi-timeline-service</include>
<include>org.apache.hudi:hudi-aws</include> <include>org.apache.hudi:hudi-aws</include>
<include>javax.servlet:javax.servlet-api</include>
<include>com.beust:jcommander</include> <include>com.beust:jcommander</include>
<include>io.javalin:javalin</include> <include>io.javalin:javalin</include>
<!-- Spark only has mortbay jetty --> <!-- Spark only has mortbay jetty -->
@@ -138,6 +140,10 @@
<!-- NOTE: We have to relocate all classes w/in org.apache.spark.sql.avro to avoid <!-- NOTE: We have to relocate all classes w/in org.apache.spark.sql.avro to avoid
potential classpath collisions in case users would like to also use "spark-avro" w/in potential classpath collisions in case users would like to also use "spark-avro" w/in
their runtime, since Hudi carries some of the same classes as "spark-avro" --> their runtime, since Hudi carries some of the same classes as "spark-avro" -->
<relocation>
<pattern>javax.servlet.</pattern>
<shadedPattern>org.apache.hudi.javax.servlet.</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>org.apache.spark.sql.avro.</pattern> <pattern>org.apache.spark.sql.avro.</pattern>
<shadedPattern>org.apache.hudi.org.apache.spark.sql.avro.</shadedPattern> <shadedPattern>org.apache.hudi.org.apache.spark.sql.avro.</shadedPattern>
@@ -378,6 +384,12 @@
<artifactId>hive-service</artifactId> <artifactId>hive-service</artifactId>
<version>${hive.version}</version> <version>${hive.version}</version>
<scope>${spark.bundle.hive.scope}</scope> <scope>${spark.bundle.hive.scope}</scope>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -426,6 +438,13 @@
<artifactId>curator-recipes</artifactId> <artifactId>curator-recipes</artifactId>
<version>${zk-curator.version}</version> <version>${zk-curator.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
</dependency>
<!-- TODO: Reinvestigate PR 633 --> <!-- TODO: Reinvestigate PR 633 -->
</dependencies> </dependencies>