[HUDI-4995] Relocate httpcomponents (apache#6906)

onehouseinc · Dec 14, 2022 · 643f906 · 643f906
1 parent 4e276ce
commit 643f906
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 40 deletions.
diff --git a/packaging/hudi-datahub-sync-bundle/pom.xml b/packaging/hudi-datahub-sync-bundle/pom.xml
@@ -88,9 +88,6 @@
                   <include>org.apache.hbase.thirdparty:hbase-shaded-netty</include>
                   <include>org.apache.hbase.thirdparty:hbase-shaded-protobuf</include>
                   <include>org.apache.htrace:htrace-core4</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:httpclient</include>
                   <include>org.apache.httpcomponents:httpasyncclient</include>
                   <include>org.apache.httpcomponents:httpcore-nio</include>
                   <include>org.openjdk.jol:jol-core</include>

diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
@@ -91,9 +91,6 @@
                   <include>io.javalin:javalin</include>
                   <include>org.jetbrains.kotlin:*</include>
                   <include>org.rocksdb:rocksdbjni</include>
-                  <include>org.apache.httpcomponents:httpclient</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
                   <include>org.antlr:stringtemplate</include>
                   <!-- Parquet -->
                   <include>org.apache.parquet:parquet-avro</include>

diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml
@@ -161,10 +161,6 @@
                   <include>org.apache.thrift:libfb303</include>
                   <include>org.apache.thrift:libthrift</include>
 
-                  <include>org.apache.httpcomponents:httpclient</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
-
                   <include>com.fasterxml.jackson.core:jackson-annotations</include>
                   <include>com.fasterxml.jackson.core:jackson-core</include>
                   <include>com.fasterxml.jackson.core:jackson-databind</include>
@@ -607,11 +603,6 @@
       <version>1.4</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>

diff --git a/packaging/hudi-kafka-connect-bundle/pom.xml b/packaging/hudi-kafka-connect-bundle/pom.xml
@@ -101,9 +101,6 @@
                                     <include>org.eclipse.jetty:*</include>
                                     <include>org.eclipse.jetty.websocket:*</include>
                                     <include>org.rocksdb:rocksdbjni</include>
-                                    <include>org.apache.httpcomponents:httpclient</include>
-                                    <include>org.apache.httpcomponents:httpcore</include>
-                                    <include>org.apache.httpcomponents:fluent-hc</include>
 
                                     <include>io.dropwizard.metrics:metrics-core</include>
                                     <include>io.dropwizard.metrics:metrics-graphite</include>

diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
@@ -90,9 +90,6 @@
                   <include>org.eclipse.jetty.websocket:*</include>
                   <include>org.jetbrains.kotlin:*</include>
                   <include>org.rocksdb:rocksdbjni</include>
-                  <include>org.apache.httpcomponents:httpclient</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
                   <include>org.antlr:stringtemplate</include>
                   <include>org.apache.parquet:parquet-avro</include>
 
@@ -150,10 +147,6 @@
                   <pattern>javax.servlet.</pattern>
                   <shadedPattern>org.apache.hudi.javax.servlet.</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>org.apache.http.</pattern>
-                  <shadedPattern>org.apache.hudi.org.apache.http.</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>com.yammer.metrics.</pattern>
                   <shadedPattern>org.apache.hudi.com.yammer.metrics.</shadedPattern>

diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml
@@ -56,12 +56,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <!-- Httpcomponents -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>fluent-hc</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.javalin</groupId>
             <artifactId>javalin</artifactId>
@@ -162,11 +156,8 @@
                       -->
                       <include>org.apache.hudi:hudi-common</include>
                       <include>org.apache.hudi:hudi-timeline-service</include>
-                      <include>org.apache.httpcomponents:httpclient</include>
-                      <include>org.apache.httpcomponents:httpcore</include>
                       <include>org.mortbay.jetty:jetty</include>
                       <include>org.mortbay.jetty:jetty-util</include>
-                      <include>org.apache.httpcomponents:fluent-hc</include>
                       <include>io.javalin:javalin</include>
                       <include>org.jetbrains.kotlin:kotlin-stdlib-jdk8</include>
                       <include>org.jetbrains.kotlin:kotlin-stdlib</include>

diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml
@@ -113,9 +113,6 @@
                   <include>org.eclipse.jetty.websocket:*</include>
                   <include>org.jetbrains.kotlin:*</include>
                   <include>org.rocksdb:rocksdbjni</include>
-                  <include>org.apache.httpcomponents:httpclient</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
                   <include>org.antlr:stringtemplate</include>
                   <include>org.apache.parquet:parquet-avro</include>
 

diff --git a/packaging/hudi-utilities-slim-bundle/pom.xml b/packaging/hudi-utilities-slim-bundle/pom.xml
@@ -105,9 +105,6 @@
                   <include>org.eclipse.jetty.websocket:*</include>
                   <include>org.jetbrains.kotlin:*</include>
                   <include>org.rocksdb:rocksdbjni</include>
-                  <include>org.apache.httpcomponents:httpclient</include>
-                  <include>org.apache.httpcomponents:httpcore</include>
-                  <include>org.apache.httpcomponents:fluent-hc</include>
                   <include>org.antlr:stringtemplate</include>
 
                   <include>com.github.davidmoten:guava-mini</include>

diff --git a/pom.xml b/pom.xml
@@ -429,6 +429,10 @@
               <include>com.esotericsoftware:kryo-shaded</include>
               <include>com.esotericsoftware:minlog</include>
               <include>org.objenesis:objenesis</include>
+              <!-- org.apache.httpcomponents -->
+              <include>org.apache.httpcomponents:httpclient</include>
+              <include>org.apache.httpcomponents:httpcore</include>
+              <include>org.apache.httpcomponents:fluent-hc</include>
             </includes>
           </artifactSet>
           <relocations>
@@ -449,6 +453,11 @@
               <pattern>org.objenesis.</pattern>
               <shadedPattern>org.apache.hudi.org.objenesis.</shadedPattern>
             </relocation>
+            <!-- org.apache.httpcomponents -->
+            <relocation>
+              <pattern>org.apache.http.</pattern>
+              <shadedPattern>org.apache.hudi.org.apache.http.</shadedPattern>
+            </relocation>
           </relocations>
         </configuration>
       </plugin>