From ed91362def208b17e7361d57ff8575933ce39248 Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Wed, 6 Mar 2024 18:02:13 +0800
Subject: [PATCH] [AMORO-2587] Add httpcomponents classes into Flink runtime
 jars (#2594)

* add httpcomponents into flink runtime jar

* apply changes to flink 1.15&1.16
---
 mixed/flink/v1.15/flink-runtime/pom.xml | 7 +++++++
 mixed/flink/v1.16/flink-runtime/pom.xml | 7 +++++++
 mixed/flink/v1.17/flink-runtime/pom.xml | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/mixed/flink/v1.15/flink-runtime/pom.xml b/mixed/flink/v1.15/flink-runtime/pom.xml
index d3a85d4fab..70d6a0e709 100644
--- a/mixed/flink/v1.15/flink-runtime/pom.xml
+++ b/mixed/flink/v1.15/flink-runtime/pom.xml
@@ -221,6 +221,8 @@
                             <include>asm:*</include>
                             <include>org.apache.flink:flink-connector-kafka</include>
                             <include>org.apache.kafka:*</include>
+                            <include>org.apache.httpcomponents.client5:*</include>
+                            <include>org.apache.httpcomponents.core5:*</include>
                         </includes>
                     </artifactSet>
                 </configuration>
@@ -386,6 +388,11 @@
                                     <shadedPattern>com.netease.arctic.shaded.com.facebook.fb303
                                     </shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hc</pattern>
+                                    <shadedPattern>com.netease.arctic.shaded.org.apache.hc
+                                    </shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/mixed/flink/v1.16/flink-runtime/pom.xml b/mixed/flink/v1.16/flink-runtime/pom.xml
index 925ff4d068..59e2760a14 100644
--- a/mixed/flink/v1.16/flink-runtime/pom.xml
+++ b/mixed/flink/v1.16/flink-runtime/pom.xml
@@ -220,6 +220,8 @@
                             <include>asm:*</include>
                             <include>org.apache.flink:flink-connector-kafka</include>
                             <include>org.apache.kafka:*</include>
+                            <include>org.apache.httpcomponents.client5:*</include>
+                            <include>org.apache.httpcomponents.core5:*</include>
                         </includes>
                     </artifactSet>
                 </configuration>
@@ -385,6 +387,11 @@
                                     <shadedPattern>com.netease.arctic.shaded.com.facebook.fb303
                                     </shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hc</pattern>
+                                    <shadedPattern>com.netease.arctic.shaded.org.apache.hc
+                                    </shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/mixed/flink/v1.17/flink-runtime/pom.xml b/mixed/flink/v1.17/flink-runtime/pom.xml
index 2d96647ebe..92b53fe1c4 100644
--- a/mixed/flink/v1.17/flink-runtime/pom.xml
+++ b/mixed/flink/v1.17/flink-runtime/pom.xml
@@ -221,6 +221,8 @@
                             <include>asm:*</include>
                             <include>org.apache.flink:flink-connector-kafka</include>
                             <include>org.apache.kafka:*</include>
+                            <include>org.apache.httpcomponents.client5:*</include>
+                            <include>org.apache.httpcomponents.core5:*</include>
                         </includes>
                     </artifactSet>
                 </configuration>
@@ -386,6 +388,11 @@
                                     <shadedPattern>com.netease.arctic.shaded.com.facebook.fb303
                                     </shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hc</pattern>
+                                    <shadedPattern>com.netease.arctic.shaded.org.apache.hc
+                                    </shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>