This is an automated email from the ASF dual-hosted git repository.
wuchunfu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new ba6259274 [Hotfix][OssFile Connector]fix ossfile bug (#3684)
ba6259274 is described below
commit ba6259274d9fedbdc2cd9150917c7c93a4bc54aa
Author: Eric <[email protected]>
AuthorDate: Thu Dec 8 22:20:35 2022 +0800
[Hotfix][OssFile Connector]fix ossfile bug (#3684)
* add jdbc drivers to ci build
* fix ossfile option rule bug
---
.../file/oss/source/OssFileSourceFactory.java | 6 +-
seatunnel-dist/pom.xml | 87 ++++++++++++++++++++++
.../src/main/assembly/assembly-bin-ci.xml | 24 ++++++
3 files changed, 114 insertions(+), 3 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-oss-jindo/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSourceFactory.java
b/seatunnel-connectors-v2/connector-file/connector-file-oss-jindo/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSourceFactory.java
index cd875c0e8..f34d2aadc 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-oss-jindo/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-oss-jindo/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSourceFactory.java
@@ -17,7 +17,6 @@
package org.apache.seatunnel.connectors.seatunnel.file.oss.source;
-import org.apache.seatunnel.api.configuration.util.Condition;
import org.apache.seatunnel.api.configuration.util.OptionRule;
import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
@@ -27,6 +26,8 @@ import
org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConfig;
import com.google.auto.service.AutoService;
+import java.util.Arrays;
+
@AutoService(Factory.class)
public class OssFileSourceFactory implements TableSourceFactory {
@Override
@@ -48,8 +49,7 @@ public class OssFileSourceFactory implements
TableSourceFactory {
.optional(OssConfig.DATE_FORMAT)
.optional(OssConfig.DATETIME_FORMAT)
.optional(OssConfig.TIME_FORMAT)
- .conditional(Condition.of(OssConfig.FILE_TYPE, "text"),
SeaTunnelSchema.SCHEMA)
- .conditional(Condition.of(OssConfig.FILE_TYPE, "json"),
SeaTunnelSchema.SCHEMA)
+ .conditional(OssConfig.FILE_TYPE, Arrays.asList("text",
"json"), SeaTunnelSchema.SCHEMA)
.build();
}
}
diff --git a/seatunnel-dist/pom.xml b/seatunnel-dist/pom.xml
index 1d26e0513..5e8134f9d 100644
--- a/seatunnel-dist/pom.xml
+++ b/seatunnel-dist/pom.xml
@@ -83,6 +83,20 @@
<value>false</value>
</property>
</activation>
+ <properties>
+ <mysql.version>8.0.16</mysql.version>
+ <postgresql.version>42.4.3</postgresql.version>
+ <dm-jdbc.version>8.1.2.141</dm-jdbc.version>
+ <sqlserver.version>9.2.1.jre8</sqlserver.version>
+ <phoenix.version>5.2.5-HBase-2.x</phoenix.version>
+ <oracle.version>12.2.0.1</oracle.version>
+ <sqlite.version>3.39.3.0</sqlite.version>
+ <db2.version>db2jcc4</db2.version>
+ <sqlite.version>3.39.3.0</sqlite.version>
+ <tablestore.version>5.13.9</tablestore.version>
+ <teradata.version>17.20.00.12</teradata.version>
+ <redshift.version>2.1.0.9</redshift.version>
+ </properties>
<dependencies>
<!-- starters -->
<dependency>
@@ -391,12 +405,85 @@
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-openmldb</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-cdc-mysql</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- jdbc driver -->
+ <dependency>
+ <groupId>com.aliyun.phoenix</groupId>
+ <artifactId>ali-phoenix-shaded-thin-client</artifactId>
+ <version>${phoenix.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <version>${dm-jdbc.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>${sqlserver.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>${oracle.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>${sqlite.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.db2.jcc</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>${db2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.aliyun.openservices</groupId>
+ <artifactId>tablestore-jdbc</artifactId>
+ <version>${tablestore.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.teradata.jdbc</groupId>
+ <artifactId>terajdbc4</artifactId>
+ <version>${teradata.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazon.redshift</groupId>
+ <artifactId>redshift-jdbc42</artifactId>
+ <version>${redshift.version}</version>
+ <scope>provided</scope>
</dependency>
+ <!-- jdbc driver end -->
</dependencies>
</profile>
<profile>
diff --git a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
index 2a004c8b8..12dde9d0c 100644
--- a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
+++ b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
@@ -146,6 +146,7 @@
<exclude>org.apache.seatunnel:connector-common</exclude>
<!-- Don't exclude connector-http-base, because it contains
SPI files -->
<exclude>org.apache.seatunnel:connector-file-base</exclude>
+
<exclude>org.apache.seatunnel:connector-file-base-hadoop</exclude>
</excludes>
<outputDirectory>/connectors/seatunnel</outputDirectory>
<scope>provided</scope>
@@ -163,5 +164,28 @@
<outputDirectory>/lib</outputDirectory>
<scope>provided</scope>
</dependencySet>
+
+ <!-- =================== JDBC Connector Drivers ===================
-->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
+
<include>com.aliyun.phoenix:ali-phoenix-shaded-thin-client:jar</include>
+ <include>mysql:mysql-connector-java:jar</include>
+ <include>org.postgresql:postgresql:jar</include>
+ <include>com.dameng:DmJdbcDriver18:jar</include>
+ <include>com.microsoft.sqlserver:mssql-jdbc:jar</include>
+ <include>com.oracle.database.jdbc:ojdbc8:jar</include>
+ <include>org.xerial:sqlite-jdbc:jar</include>
+ <include>com.ibm.db2.jcc:db2jcc:jar</include>
+ <include>com.aliyun.openservices:tablestore-jdbc:jar</include>
+ <include>com.teradata.jdbc:terajdbc4:jar</include>
+ <include>com.amazon.redshift:redshift-jdbc42:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
+ <outputDirectory>/lib/jdbc_driver</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
</dependencySets>
</assembly>
