This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new 434b06cc2 [AMORO-2857] Fix http client class not found error in
mixed-format spark runtime jars (#2866)
434b06cc2 is described below
commit 434b06cc27af8e63d5987035319b14b818980352
Author: ZhouJinsong <[email protected]>
AuthorDate: Tue May 28 10:34:34 2024 +0800
[AMORO-2857] Fix http client class not found error in mixed-format spark
runtime jars (#2866)
Shade http client in spark runtime jars
---
.../v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml | 9 +++++++--
.../v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml | 8 +++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git
a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml
b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml
index 96c444536..2ac5d44e5 100644
---
a/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml
+++
b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/amoro-mixed-format-spark-runtime-3.2/pom.xml
@@ -91,7 +91,6 @@
</include>
<include>org.apache.iceberg:iceberg-bundled-guava</include>
<include>org.apache.orc:*</include>
-
<include>org.apache.thrift:libthrift</include>
<include>org.apache.avro:avro</include>
<include>org.apache.parquet:parquet-avro</include>
@@ -99,6 +98,8 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.commons:commons-collections</include>
<include>com.github.ben-manes.caffeine:caffeine</include>
+
<include>org.apache.httpcomponents.client5:*</include>
+
<include>org.apache.httpcomponents.core5:*</include>
</includes>
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
@@ -486,7 +487,11 @@
</include>
</includes>
</relocation>
-
+ <relocation>
+ <pattern>org.apache.hc</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.hc
+ </shadedPattern>
+ </relocation>
</relocations>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
diff --git
a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml
b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml
index ce8062d77..2007f03e0 100644
---
a/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml
+++
b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/amoro-mixed-format-spark-runtime-3.3/pom.xml
@@ -97,6 +97,8 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.commons:commons-collections</include>
<include>com.github.ben-manes.caffeine:caffeine</include>
+
<include>org.apache.httpcomponents.client5:*</include>
+
<include>org.apache.httpcomponents.core5:*</include>
</includes>
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
@@ -502,7 +504,11 @@
</include>
</includes>
</relocation>
-
+ <relocation>
+ <pattern>org.apache.hc</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.hc
+ </shadedPattern>
+ </relocation>
</relocations>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
