From 1ff453b9cb5dad8c6d4052037e6fee25f6473e61 Mon Sep 17 00:00:00 2001
From: Chen HaoYu <chy9700@163.com>
Date: Wed, 17 May 2023 09:50:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3sftp=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5=E6=9C=AA?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E8=8E=B7=E5=8F=96ChannelSft=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0nullPointerException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/alibaba/datax/plugin/reader/ftpreader/SftpHelper.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ftpreader/src/main/java/com/alibaba/datax/plugin/reader/ftpreader/SftpHelper.java b/ftpreader/src/main/java/com/alibaba/datax/plugin/reader/ftpreader/SftpHelper.java
index d25b040c..6e42e10c 100644
--- a/ftpreader/src/main/java/com/alibaba/datax/plugin/reader/ftpreader/SftpHelper.java
+++ b/ftpreader/src/main/java/com/alibaba/datax/plugin/reader/ftpreader/SftpHelper.java
@@ -64,6 +64,8 @@ public class SftpHelper extends FtpHelper {
 					String message = String.format("请确认连接ftp服务器端口是否正确，错误的端口: [%s] ", port);
 					LOG.error(message);
 					throw DataXException.asDataXException(FtpReaderErrorCode.FAIL_LOGIN, message, e);
+				}else{
+					throw DataXException.asDataXException(FtpReaderErrorCode.COMMAND_FTP_IO_EXCEPTION, "", e);
 				}
 			}else {
 				if("Auth fail".equals(e.getMessage())){

From 8bddafba085491b29f094d765cbed22efaa1dccd Mon Sep 17 00:00:00 2001
From: ChengDaqi2023 <131479795+ChengDaqi2023@users.noreply.github.com>
Date: Mon, 24 Jul 2023 09:20:25 +0800
Subject: [PATCH 2/3] update com.jcraft:jsch 0.1.51 to 0.1.54

---
 ftpreader/pom.xml | 4 ++--
 ftpwriter/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ftpreader/pom.xml b/ftpreader/pom.xml
index 7778d491..57bf889d 100755
--- a/ftpreader/pom.xml
+++ b/ftpreader/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.jcraft</groupId>
 			<artifactId>jsch</artifactId>
-			<version>0.1.51</version>
+			<version>0.1.54</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-net</groupId>
@@ -89,4 +89,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
diff --git a/ftpwriter/pom.xml b/ftpwriter/pom.xml
index 69ec4a07..bf7ce83d 100644
--- a/ftpwriter/pom.xml
+++ b/ftpwriter/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.jcraft</groupId>
 			<artifactId>jsch</artifactId>
-			<version>0.1.51</version>
+			<version>0.1.54</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-net</groupId>

From e70cd76a3a75ed4ef32022dcddb248adf392a030 Mon Sep 17 00:00:00 2001
From: penglin <peng.linlp@alibaba-inc.com>
Date: Mon, 21 Aug 2023 17:11:01 +0800
Subject: [PATCH 3/3]  fix clickhouse assembly issue

---
 clickhousereader/src/main/assembly/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clickhousereader/src/main/assembly/package.xml b/clickhousereader/src/main/assembly/package.xml
index 2053ff75..9dc7fc13 100644
--- a/clickhousereader/src/main/assembly/package.xml
+++ b/clickhousereader/src/main/assembly/package.xml
@@ -2,7 +2,7 @@
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>datax</id>
+    <id></id>
     <formats>
         <format>dir</format>
     </formats>