use httpclient5 for vfs, fix a test , fixes #4167

fix license header
apache · Jul 26, 2024 · 56f7425 · 56f7425
1 parent 45fcad4
commit 56f7425
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -134,6 +134,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

diff --git a/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java b/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java
@@ -136,8 +136,8 @@ private static DefaultFileSystemManager createFileSystemManager() throws HopExce
       fsm.addProvider("zip", new org.apache.commons.vfs2.provider.zip.ZipFileProvider());
       fsm.addProvider("gz", new org.apache.commons.vfs2.provider.gzip.GzipFileProvider());
       fsm.addProvider("jar", new org.apache.commons.vfs2.provider.jar.JarFileProvider());
-      fsm.addProvider("http", new org.apache.commons.vfs2.provider.http.HttpFileProvider());
-      fsm.addProvider("https", new org.apache.commons.vfs2.provider.https.HttpsFileProvider());
+      fsm.addProvider("http", new org.apache.commons.vfs2.provider.http5.Http5FileProvider());
+      fsm.addProvider("https", new org.apache.commons.vfs2.provider.http5s.Http5sFileProvider());
       fsm.addProvider("ftp", new org.apache.commons.vfs2.provider.ftp.FtpFileProvider());
       fsm.addProvider("ftps", new org.apache.commons.vfs2.provider.ftps.FtpsFileProvider());
       fsm.addProvider("sftp", new org.apache.commons.vfs2.provider.sftp.SftpFileProvider());

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -78,6 +78,7 @@
         <hive.version>2.3.9</hive.version>
         <httpccore.version>4.4.15</httpccore.version>
         <httpclient.version>4.5.13</httpclient.version>
+        <httpclient5.version>5.3.1</httpclient5.version>
         <jackcess.version>4.0.4</jackcess.version>
         <jackson.version>2.15.0</jackson.version>
         <jakarta-mail.version>2.0.1</jakarta-mail.version>
@@ -415,6 +416,17 @@
                 <artifactId>httpcore</artifactId>
                 <version>${httpccore.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpclient5.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>

diff --git a/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf b/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf
@@ -53,24 +53,24 @@ limitations under the License.
       <description/>
       <type>PIPELINE</type>
       <attributes/>
-      <filename>${PROJECT_HOME}/reflection/generate-fake-books.hpl</filename>
-      <params_from_previous>N</params_from_previous>
-      <exec_per_row>N</exec_per_row>
-      <clear_rows>N</clear_rows>
-      <clear_files>N</clear_files>
-      <set_logfile>N</set_logfile>
-      <logfile/>
-      <logext/>
       <add_date>N</add_date>
       <add_time>N</add_time>
-      <loglevel>Basic</loglevel>
-      <set_append_logfile>N</set_append_logfile>
-      <wait_until_finished>Y</wait_until_finished>
+      <clear_files>N</clear_files>
+      <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
-      <run_configuration>Spark</run_configuration>
+      <exec_per_row>N</exec_per_row>
+      <filename>${PROJECT_HOME}/reflection/generate-fake-books.hpl</filename>
+      <logext/>
+      <logfile/>
+      <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
       </parameters>
+      <params_from_previous>N</params_from_previous>
+      <run_configuration>local</run_configuration>
+      <set_append_logfile>N</set_append_logfile>
+      <set_logfile>N</set_logfile>
+      <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
       <xloc>209</xloc>
       <yloc>80</yloc>
@@ -81,8 +81,8 @@ limitations under the License.
       <description/>
       <type>WRITE_TO_LOG</type>
       <attributes/>
+      <loglevel>Basic</loglevel>
       <logmessage/>
-      <loglevel/>
       <logsubject/>
       <parallel>N</parallel>
       <xloc>368</xloc>