Merge master into UpdateThirdPartyLicenses.

This commit is contained in:
Tom Page
2019-03-19 14:49:18 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -95,7 +95,7 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>2.25.0</version> <version>2.25.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

View File

@@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>2.25.0</version> <version>2.25.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>