chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/mcy

Browse Source 
# Conflicts:
#	client-adapter/rdb/pom.xml
This commit is contained in:
machey
2018-11-16 00:06:56 +08:00
parent 7ee7ba0e05 14c0e4535a
commit fc6c871382
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client-adapter/launcher/pom.xml
View File

@@ -72,6 +72,23 @@
<version>1.1.1</version> <version>1.1.1</version>
</dependency> </dependency>
<!-- jdbc -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.1.4</version>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.3</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.0.0.jre8</version>
</dependency>
<!-- outer adapter jar with dependencies--> <!-- outer adapter jar with dependencies-->
<dependency> <dependency>
<groupId>com.alibaba.otter</groupId> <groupId>com.alibaba.otter</groupId>

13
client-adapter/pom.xml
View File

@@ -25,6 +25,19 @@
<module>rdb</module> <module>rdb</module>
</modules> </modules>
<repositories>
<repository>
<id>central</id>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

34
client-adapter/rdb/pom.xml
View File

@@ -27,30 +27,24 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>mysql</groupId>--> <groupId>org.postgresql</groupId>
<!--<artifactId>mysql-connector-java</artifactId>--> <artifactId>postgresql</artifactId>
<!--<version>5.1.40</version>--> <version>42.1.4</version>
<!--<scope>test</scope>--> <scope>test</scope>
<!--</dependency>--> </dependency>
<!--<dependency>-->
<!--<groupId>org.postgresql</groupId>-->
<!--<artifactId>postgresql</artifactId>-->
<!--<version>42.1.4</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
<version>11.2.0.4.0-atlassian-hosted</version> <version>11.2.0.3</version>
<!--<scope>test</scope>--> <scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.0.0.jre8</version>
<scope>test</scope>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>com.microsoft.sqlserver</groupId>-->
<!--<artifactId>mssql-jdbc</artifactId>-->
<!--<version>7.0.0.jre8</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>