Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson
2016-11-18 12:04:30 +00:00
3 changed files with 13 additions and 3 deletions

View File

@@ -126,6 +126,7 @@
<logback.version>1.1.7</logback.version>
<lombok.version>1.16.10</lombok.version>
<mariadb.version>1.4.6</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>3.2.2</mongodb.version>
<mysql.version>5.1.40</mysql.version>
@@ -733,6 +734,11 @@
<artifactId>json-path-assert</artifactId>
<version>${json-path.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql-jdbc.version}</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>