Merge branch 'master' into feature/mcy

# Conflicts:
#	client-adapter/rdb/pom.xml
This commit is contained in:
machey
2018-11-16 00:06:56 +08:00
3 changed files with 44 additions and 20 deletions

View File

@@ -72,6 +72,23 @@
<version>1.1.1</version>
</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-->
<dependency>
<groupId>com.alibaba.otter</groupId>