Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library

Closes gh-15555
This commit is contained in:
Andy Wilkinson
2019-05-22 13:39:44 +01:00
parent f1dd973cdc
commit 23f803c6b6
12 changed files with 95 additions and 22 deletions

View File

@@ -88,6 +88,14 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -401,6 +409,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -660,7 +674,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<optional>true</optional>
</dependency>
<dependency>