Skip to content

Commit 251440b

Browse files
todd5167todd5167
committed
sqlserver side depend on rdb
1 parent 96c5617 commit 251440b

8 files changed

Lines changed: 67 additions & 40 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<module>launcher</module>
1919
<module>rdb</module>
2020
<module>sqlserver</module>
21-
<module>rdb</module>
2221
</modules>
2322
<packaging>pom</packaging>
2423

‎rdb/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<properties>
2121
<junit.version>3.8.1</junit.version>
22+
<sql.core.version>1.0-SNAPSHOT</sql.core.version>
2223
</properties>
2324

2425
<dependencies>
@@ -32,7 +33,7 @@
3233
<dependency>
3334
<groupId>com.dtstack.flink</groupId>
3435
<artifactId>sql.core</artifactId>
35-
<version>1.0-SNAPSHOT</version>
36+
<version>${sql.core.version}</version>
3637
<scope>provided</scope>
3738
</dependency>
3839
</dependencies>

‎rdb/rdb-side/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,27 @@
1414
<name>rdb-side</name>
1515
<packaging>jar</packaging>
1616

17+
<properties>
18+
<vertx.version>3.5.2</vertx.version>
19+
</properties>
20+
21+
22+
<dependencies>
23+
<!--异步数据库连接-->
24+
<!--需要提取到对应的插件-->
25+
<dependency>
26+
<groupId>io.vertx</groupId>
27+
<artifactId>vertx-jdbc-client</artifactId>
28+
<version>${vertx.version}</version>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>io.vertx</groupId>
33+
<artifactId>vertx-core</artifactId>
34+
<version>${vertx.version}</version>
35+
</dependency>
36+
37+
</dependencies>
38+
39+
1740
</project>

‎rdb/sqlserver/sqlserver-side/sqlserver-side-core/src/main/java/com/dtstack/flink/sql/side/sqlserver/table/SqlserverSideParser.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎sqlserver/pom.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,30 @@
1818

1919
<properties>
2020
<jtds.version>1.3.1</jtds.version>
21+
<sql.core.version>1.0-SNAPSHOT</sql.core.version>
22+
<sql.side.rdb.version>1.0-SNAPSHOT</sql.side.rdb.version>
2123
</properties>
2224

2325
<dependencies>
2426
<dependency>
25-
<groupId>net.sourceforge.jtds</groupId>
26-
<artifactId>jtds</artifactId>
27-
<version>${jtds.version}</version>
27+
<groupId>com.dtstack.flink</groupId>
28+
<artifactId>sql.side.rdb</artifactId>
29+
<version>${sql.side.rdb.version}</version>
30+
<scope>provided</scope>
2831
</dependency>
2932

3033
<dependency>
3134
<groupId>com.dtstack.flink</groupId>
32-
<artifactId>sql.side.rdb</artifactId>
33-
<version>1.0-SNAPSHOT</version>
35+
<artifactId>sql.core</artifactId>
36+
<version>${sql.core.version}</version>
3437
<scope>provided</scope>
3538
</dependency>
39+
40+
<dependency>
41+
<groupId>net.sourceforge.jtds</groupId>
42+
<artifactId>jtds</artifactId>
43+
<version>${jtds.version}</version>
44+
</dependency>
3645
</dependencies>
3746

3847
</project>

‎sqlserver/sqlserver-side/pom.xml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,27 @@
1515
<name>sqlserver-side</name>
1616
<packaging>pom</packaging>
1717

18+
<properties>
19+
<rdb.side.version>1.0-SNAPSHOT</rdb.side.version>
20+
</properties>
21+
22+
1823
<modules>
1924
<module>sqlserver-side-core</module>
2025
<module>sqlserver-all-side</module>
21-
<module>sqlserver-side-core</module>
26+
<module>sqlserver-async-side</module>
2227
</modules>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>com.dtstack.flink</groupId>
32+
<artifactId>sql.side.rdb</artifactId>
33+
<version>${rdb.side.version}</version>
34+
</dependency>
35+
36+
37+
</dependencies>
38+
39+
40+
2341
</project>

‎sqlserver/sqlserver-side/sqlserver-all-side/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
<name>sqlserver-all-side</name>
1515
<packaging>jar</packaging>
1616

17+
<properties>
18+
<sql.side.sqlserver.core.version>1.0-SNAPSHOT</sql.side.sqlserver.core.version>
19+
</properties>
20+
1721
<dependencies>
1822
<dependency>
1923
<groupId>com.dtstack.flink</groupId>
2024
<artifactId>sql.side.sqlserver.core</artifactId>
21-
<version>1.0-SNAPSHOT</version>
25+
<version>${sql.side.sqlserver.core.version}</version>
2226
</dependency>
2327
</dependencies>
2428

@@ -68,14 +72,14 @@
6872
</goals>
6973
<configuration>
7074
<tasks>
71-
<copy todir="${basedir}/../../../../plugins/sqlserverallside">
75+
<copy todir="${basedir}/../../../plugins/sqlserverallside">
7276
<fileset dir="target/">
7377
<include name="${project.artifactId}-${project.version}.jar"/>
7478
</fileset>
7579
</copy>
7680

77-
<move file="${basedir}/../../../../plugins/sqlserverallside/${project.artifactId}-${project.version}.jar"
78-
tofile="${basedir}/../../../../plugins/sqlserverallside/${project.name}.jar"/>
81+
<move file="${basedir}/../../../plugins/sqlserverallside/${project.artifactId}-${project.version}.jar"
82+
tofile="${basedir}/../../../plugins/sqlserverallside/${project.name}.jar"/>
7983
</tasks>
8084
</configuration>
8185
</execution>

‎sqlserver/sqlserver-side/sqlserver-side-core/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
<packaging>jar</packaging>
1515

1616

17+
1718
</project>

0 commit comments

Comments
 (0)