diff --git a/cassandrareader/pom.xml b/cassandrareader/pom.xml index 0bf6ef0841..d653a45902 100644 --- a/cassandrareader/pom.xml +++ b/cassandrareader/pom.xml @@ -5,7 +5,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 cassandrareader cassandrareader diff --git a/cassandrawriter/pom.xml b/cassandrawriter/pom.xml index b393abcc9e..6c73340de1 100644 --- a/cassandrawriter/pom.xml +++ b/cassandrawriter/pom.xml @@ -5,13 +5,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 cassandrawriter cassandrawriter - 3.7.0 + 3.7.1 jar diff --git a/clickhousewriter/pom.xml b/clickhousewriter/pom.xml index 27d631a698..01320d448e 100644 --- a/clickhousewriter/pom.xml +++ b/clickhousewriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 1a7ba3a8ac..a184f0280e 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 datax-common diff --git a/core/pom.xml b/core/pom.xml index 9860fb5dee..3236188125 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 datax-core diff --git a/doriswriter/pom.xml b/doriswriter/pom.xml index fa162abda1..c0042577fc 100755 --- a/doriswriter/pom.xml +++ b/doriswriter/pom.xml @@ -22,7 +22,7 @@ under the License. com.alibaba.datax datax-all - 3.7.0 + 3.7.1 ../pom.xml 4.0.0 diff --git a/drdsreader/pom.xml b/drdsreader/pom.xml index 70a05d22b2..a6f4142891 100755 --- a/drdsreader/pom.xml +++ b/drdsreader/pom.xml @@ -6,7 +6,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 drdsreader diff --git a/drdswriter/pom.xml b/drdswriter/pom.xml index c9f4b1e6a2..64e14560dd 100755 --- a/drdswriter/pom.xml +++ b/drdswriter/pom.xml @@ -6,7 +6,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 drdswriter diff --git a/elasticsearchwriter/pom.xml b/elasticsearchwriter/pom.xml index 6d7b960354..e5aab39cd3 100644 --- a/elasticsearchwriter/pom.xml +++ b/elasticsearchwriter/pom.xml @@ -3,14 +3,14 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 elasticsearchwriter com.alibaba.datax - 3.7.0 + 3.7.1 6.3.1 diff --git a/ftp-common/pom.xml b/ftp-common/pom.xml index c4a0d8985b..738646ae47 100644 --- a/ftp-common/pom.xml +++ b/ftp-common/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 ../pom.xml 4.0.0 diff --git a/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java b/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java index 54ca763eda..5b02e2544a 100644 --- a/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java +++ b/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java @@ -31,14 +31,15 @@ public void loginFtpServer(String host, String username, String password, int po String connectMode) { ftpClient = new FTPClient(); try { + ftpClient.setConnectTimeout(timeout); + ftpClient.setDataTimeout(timeout); // 连接 ftpClient.connect(host, port); // 登录 ftpClient.login(username, password); // 不需要写死ftp server的OS TYPE,FTPClient getSystemType()方法会自动识别 // ftpClient.configure(new FTPClientConfig(FTPClientConfig.SYST_UNIX)); - ftpClient.setConnectTimeout(timeout); - ftpClient.setDataTimeout(timeout); + if ("PASV".equalsIgnoreCase(connectMode)) { ftpClient.enterRemotePassiveMode(); ftpClient.enterLocalPassiveMode(); diff --git a/ftpreader/pom.xml b/ftpreader/pom.xml index c6080f240b..5f0dc95f8a 100755 --- a/ftpreader/pom.xml +++ b/ftpreader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 ftpreader ftpreader diff --git a/ftpwriter/pom.xml b/ftpwriter/pom.xml index da16ea9d3a..e38b5cc927 100644 --- a/ftpwriter/pom.xml +++ b/ftpwriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 ftpwriter ftpwriter diff --git a/gdbreader/pom.xml b/gdbreader/pom.xml index c764f7a184..c54edf9bee 100644 --- a/gdbreader/pom.xml +++ b/gdbreader/pom.xml @@ -3,14 +3,14 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 gdbreader com.alibaba.datax - 3.7.0 + 3.7.1 diff --git a/gdbwriter/pom.xml b/gdbwriter/pom.xml index 4688da0e7e..04a65024bf 100644 --- a/gdbwriter/pom.xml +++ b/gdbwriter/pom.xml @@ -6,7 +6,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 gdbwriter diff --git a/hbase094xreader/pom.xml b/hbase094xreader/pom.xml index fa6babcbbc..42e7ff222f 100644 --- a/hbase094xreader/pom.xml +++ b/hbase094xreader/pom.xml @@ -5,13 +5,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase094xreader hbase094xreader - 3.7.0 + 3.7.1 diff --git a/hbase094xwriter/pom.xml b/hbase094xwriter/pom.xml index 916eeb595d..c17fa03ee8 100644 --- a/hbase094xwriter/pom.xml +++ b/hbase094xwriter/pom.xml @@ -5,13 +5,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase094xwriter hbase094xwriter - 3.7.0 + 3.7.1 1.8 @@ -75,7 +75,7 @@ com.alibaba.datax datax-common - 3.7.0 + 3.7.1 diff --git a/hbase11xreader/pom.xml b/hbase11xreader/pom.xml index 9485c92c27..7cfd9af9de 100644 --- a/hbase11xreader/pom.xml +++ b/hbase11xreader/pom.xml @@ -4,11 +4,11 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 hbase11xreader hbase11xreader - 3.7.0 + 3.7.1 jar diff --git a/hbase11xsqlreader/pom.xml b/hbase11xsqlreader/pom.xml index 6a3a6c74e7..5bbb98e7ed 100644 --- a/hbase11xsqlreader/pom.xml +++ b/hbase11xsqlreader/pom.xml @@ -4,11 +4,11 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 hbase11xsqlreader hbase11xsqlreader - 3.7.0 + 3.7.1 jar diff --git a/hbase11xsqlwriter/pom.xml b/hbase11xsqlwriter/pom.xml index f908fbecd3..455926ee68 100644 --- a/hbase11xsqlwriter/pom.xml +++ b/hbase11xsqlwriter/pom.xml @@ -5,13 +5,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase11xsqlwriter hbase11xsqlwriter - 3.7.0 + 3.7.1 jar diff --git a/hbase11xwriter/pom.xml b/hbase11xwriter/pom.xml index b11795331d..a643b01fb4 100644 --- a/hbase11xwriter/pom.xml +++ b/hbase11xwriter/pom.xml @@ -5,13 +5,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase11xwriter hbase11xwriter - 3.7.0 + 3.7.1 jar diff --git a/hbase20xsqlreader/pom.xml b/hbase20xsqlreader/pom.xml index afb58ea3cc..6e0ddf52bf 100644 --- a/hbase20xsqlreader/pom.xml +++ b/hbase20xsqlreader/pom.xml @@ -5,12 +5,12 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase20xsqlreader - 3.7.0 + 3.7.1 jar @@ -63,7 +63,7 @@ com.alibaba.datax plugin-rdbms-util - 3.7.0 + 3.7.1 compile diff --git a/hbase20xsqlwriter/pom.xml b/hbase20xsqlwriter/pom.xml index e9d908147a..09fe3ae459 100644 --- a/hbase20xsqlwriter/pom.xml +++ b/hbase20xsqlwriter/pom.xml @@ -5,12 +5,12 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hbase20xsqlwriter - 3.7.0 + 3.7.1 jar diff --git a/hdfsreader/pom.xml b/hdfsreader/pom.xml index 7cef804459..f3d061e43c 100644 --- a/hdfsreader/pom.xml +++ b/hdfsreader/pom.xml @@ -3,13 +3,13 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 hdfsreader com.alibaba.datax - 3.7.0 + 3.7.1 jar 1.1.1 diff --git a/hdfswriter/pom.xml b/hdfswriter/pom.xml index 71d1a923c0..b76cc870b5 100644 --- a/hdfswriter/pom.xml +++ b/hdfswriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/kingbaseesreader/pom.xml b/kingbaseesreader/pom.xml index 6d15dafd0e..b01e1b99f4 100644 --- a/kingbaseesreader/pom.xml +++ b/kingbaseesreader/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/kingbaseeswriter/pom.xml b/kingbaseeswriter/pom.xml index 0f6a39fad1..6397496166 100644 --- a/kingbaseeswriter/pom.xml +++ b/kingbaseeswriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 kingbaseeswriter kingbaseeswriter diff --git a/kuduwriter/pom.xml b/kuduwriter/pom.xml index a0459c4b61..2cf0895ef4 100644 --- a/kuduwriter/pom.xml +++ b/kuduwriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/mongodbreader/pom.xml b/mongodbreader/pom.xml index 4e914e5d5f..444f98697c 100644 --- a/mongodbreader/pom.xml +++ b/mongodbreader/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/mongodbwriter/pom.xml b/mongodbwriter/pom.xml index 461bb9e8f2..4819a31c97 100644 --- a/mongodbwriter/pom.xml +++ b/mongodbwriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 mongodbwriter diff --git a/mysqlreader/pom.xml b/mysqlreader/pom.xml index 72ee1e389f..77e6806342 100755 --- a/mysqlreader/pom.xml +++ b/mysqlreader/pom.xml @@ -5,7 +5,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 mysqlreader mysqlreader diff --git a/mysqlwriter/pom.xml b/mysqlwriter/pom.xml index 7f24bf7147..13508038e9 100755 --- a/mysqlwriter/pom.xml +++ b/mysqlwriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 mysqlwriter mysqlwriter diff --git a/ocswriter/pom.xml b/ocswriter/pom.xml index 265ac7a634..201e4c8f62 100644 --- a/ocswriter/pom.xml +++ b/ocswriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/odpsreader/pom.xml b/odpsreader/pom.xml index f4740a46ee..a4ac5ab769 100755 --- a/odpsreader/pom.xml +++ b/odpsreader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 odpsreader diff --git a/odpswriter/pom.xml b/odpswriter/pom.xml index fcc58d7d65..6fda57bfb0 100755 --- a/odpswriter/pom.xml +++ b/odpswriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 odpswriter odpswriter diff --git a/opentsdbreader/pom.xml b/opentsdbreader/pom.xml index 859144f8fd..1e843b682a 100644 --- a/opentsdbreader/pom.xml +++ b/opentsdbreader/pom.xml @@ -7,7 +7,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 opentsdbreader diff --git a/oraclereader/pom.xml b/oraclereader/pom.xml index 1daf349fe0..846f90a20c 100755 --- a/oraclereader/pom.xml +++ b/oraclereader/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/oraclewriter/pom.xml b/oraclewriter/pom.xml index 93ea168522..f9fea0bb21 100755 --- a/oraclewriter/pom.xml +++ b/oraclewriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 oraclewriter oraclewriter diff --git a/oscarwriter/pom.xml b/oscarwriter/pom.xml index ca3b884afe..2755a4d00c 100644 --- a/oscarwriter/pom.xml +++ b/oscarwriter/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 oscarwriter diff --git a/ossreader/pom.xml b/ossreader/pom.xml index ec0550f4d2..e1c0254e22 100755 --- a/ossreader/pom.xml +++ b/ossreader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 ossreader ossreader diff --git a/osswriter/pom.xml b/osswriter/pom.xml index 71779ff819..f89bdddaba 100644 --- a/osswriter/pom.xml +++ b/osswriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 osswriter osswriter diff --git a/otswriter/pom.xml b/otswriter/pom.xml index 893e875ac3..c35f3ea6c8 100644 --- a/otswriter/pom.xml +++ b/otswriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 otswriter otswriter diff --git a/plugin-rdbms-util/pom.xml b/plugin-rdbms-util/pom.xml index a8998b0dd8..366c8574b2 100755 --- a/plugin-rdbms-util/pom.xml +++ b/plugin-rdbms-util/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 plugin-rdbms-util plugin-rdbms-util diff --git a/plugin-unstructured-storage-util/pom.xml b/plugin-unstructured-storage-util/pom.xml index 2b3e2cb3a7..53488f0462 100755 --- a/plugin-unstructured-storage-util/pom.xml +++ b/plugin-unstructured-storage-util/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 plugin-unstructured-storage-util plugin-unstructured-storage-util diff --git a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/reader/UnstructuredStorageReaderUtil.java b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/reader/UnstructuredStorageReaderUtil.java index 989ac95512..6aec7ecc83 100755 --- a/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/reader/UnstructuredStorageReaderUtil.java +++ b/plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/reader/UnstructuredStorageReaderUtil.java @@ -575,10 +575,17 @@ public static void validateCompress(Configuration readerConfiguration) { public static void validateFieldDelimiter(Configuration readerConfiguration) { //fieldDelimiter check String delimiterInStr = readerConfiguration.getString(com.alibaba.datax.plugin.unstructuredstorage.reader.Key.FIELD_DELIMITER, null); + String fileFormat = readerConfiguration.getString(com.alibaba.datax.plugin.unstructuredstorage.writer.Key.FILE_FORMAT); + + if (null == delimiterInStr) { - throw DataXException.asDataXException(UnstructuredStorageReaderErrorCode.REQUIRED_VALUE, - String.format("您提供配置文件有误，[%s]是必填参数.", - com.alibaba.datax.plugin.unstructuredstorage.reader.Key.FIELD_DELIMITER)); + if (com.alibaba.datax.plugin.unstructuredstorage.writer.Constant.FILE_FORMAT_TEXT.equals(fileFormat)) { + + throw DataXException.asDataXException(UnstructuredStorageReaderErrorCode.REQUIRED_VALUE, + String.format("您提供配置文件有误，[%s]是必填参数.", + com.alibaba.datax.plugin.unstructuredstorage.reader.Key.FIELD_DELIMITER)); + } + } else if (1 != delimiterInStr.length()) { // warn: if have, length must be one throw DataXException.asDataXException(UnstructuredStorageReaderErrorCode.ILLEGAL_VALUE, diff --git a/pom.xml b/pom.xml index 9ab5bbdcdc..44691ce78d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 org.hamcrest diff --git a/postgresqlreader/pom.xml b/postgresqlreader/pom.xml index 905fb307bd..4d9ee15476 100755 --- a/postgresqlreader/pom.xml +++ b/postgresqlreader/pom.xml @@ -5,7 +5,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/postgresqlwriter/pom.xml b/postgresqlwriter/pom.xml index 387779a97c..6793be15a6 100755 --- a/postgresqlwriter/pom.xml +++ b/postgresqlwriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 postgresqlwriter postgresqlwriter diff --git a/rdbmsreader/pom.xml b/rdbmsreader/pom.xml index 70b428a4ae..42a06feee4 100755 --- a/rdbmsreader/pom.xml +++ b/rdbmsreader/pom.xml @@ -4,7 +4,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/rdbmswriter/pom.xml b/rdbmswriter/pom.xml index b74ac7b5f2..e18ac72693 100755 --- a/rdbmswriter/pom.xml +++ b/rdbmswriter/pom.xml @@ -4,7 +4,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/setversion.sh b/setversion.sh index 919415867d..0561dbe8cc 100644 --- a/setversion.sh +++ b/setversion.sh @@ -1 +1 @@ -mvn versions:set -DnewVersion=3.7.0 -DprocessDependencies=true -DgenerateBackupPoms=false +mvn versions:set -DnewVersion=3.7.1 -DprocessDependencies=true -DgenerateBackupPoms=false diff --git a/sqlserverreader/pom.xml b/sqlserverreader/pom.xml index 2bd81f469f..4f63f8ff61 100755 --- a/sqlserverreader/pom.xml +++ b/sqlserverreader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 sqlserverreader diff --git a/sqlserverwriter/pom.xml b/sqlserverwriter/pom.xml index 0e7f952d57..61e8c93899 100644 --- a/sqlserverwriter/pom.xml +++ b/sqlserverwriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 sqlserverwriter sqlserverwriter diff --git a/starrockswriter/pom.xml b/starrockswriter/pom.xml index 93c6ee3ac4..548592e61c 100755 --- a/starrockswriter/pom.xml +++ b/starrockswriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 starrockswriter diff --git a/streamreader/pom.xml b/streamreader/pom.xml index cdcb0bec9e..7aaabd7e5b 100755 --- a/streamreader/pom.xml +++ b/streamreader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 streamreader diff --git a/streamwriter/pom.xml b/streamwriter/pom.xml index 4d151bacdf..d5e8ae6ee2 100755 --- a/streamwriter/pom.xml +++ b/streamwriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 streamwriter diff --git a/transformer/pom.xml b/transformer/pom.xml index fc78e7f267..7c888fe2f0 100644 --- a/transformer/pom.xml +++ b/transformer/pom.xml @@ -3,7 +3,7 @@ datax-all com.alibaba.datax - 3.7.0 + 3.7.1 4.0.0 diff --git a/tsdbreader/pom.xml b/tsdbreader/pom.xml index 87d36ff300..783af7123e 100644 --- a/tsdbreader/pom.xml +++ b/tsdbreader/pom.xml @@ -7,7 +7,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 tsdbreader diff --git a/tsdbwriter/pom.xml b/tsdbwriter/pom.xml index 241f6cbad9..b4b1f0d2cf 100644 --- a/tsdbwriter/pom.xml +++ b/tsdbwriter/pom.xml @@ -7,7 +7,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 tsdbwriter diff --git a/txtfilereader/pom.xml b/txtfilereader/pom.xml index 8f09f8dd28..88d21da526 100755 --- a/txtfilereader/pom.xml +++ b/txtfilereader/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 txtfilereader txtfilereader diff --git a/txtfilewriter/pom.xml b/txtfilewriter/pom.xml index 2e0d160294..e10ef19d73 100755 --- a/txtfilewriter/pom.xml +++ b/txtfilewriter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.datax datax-all - 3.7.0 + 3.7.1 txtfilewriter