Skip to content

Commit

Permalink
use httpclient5 for vfs, fix a test , fixes #4167
Browse files Browse the repository at this point in the history
  • Loading branch information
hansva committed Jul 26, 2024
1 parent 45fcad4 commit f3aa6ef
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 33 deletions.
4 changes: 4 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/hop/core/vfs/HopVfs.java
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
12 changes: 12 additions & 0 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<workflow>
<name>generate-fake-books</name>
<name_sync_with_filename>Y</name_sync_with_filename>
Expand Down Expand Up @@ -53,24 +35,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>
Expand All @@ -81,8 +63,8 @@ limitations under the License.
<description/>
<type>WRITE_TO_LOG</type>
<attributes/>
<loglevel>Basic</loglevel>
<logmessage/>
<loglevel/>
<logsubject/>
<parallel>N</parallel>
<xloc>368</xloc>
Expand Down

0 comments on commit f3aa6ef

Please sign in to comment.