root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Closes gh-15555
pull/16948/head
Andy Wilkinson 6 years ago
parent f1dd973cdc
commit 23f803c6b6
12 changed files with 95 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
Unescape Escape View File

@ -497,6 +497,12 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>

6
spring-boot-project/spring-boot-autoconfigure/pom.xml
Unescape Escape View File

@ -855,6 +855,12 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>

6
spring-boot-project/spring-boot-cli/pom.xml
Unescape Escape View File

@ -153,6 +153,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java
Unescape Escape View File

@ -121,9 +121,9 @@ public class GroovyGrabDependencyResolverTests {
public void resolveMultipleArtifacts() throws Exception {
List<File> resolved = this.resolver.resolve(Arrays.asList("junit:junit:4.11",
"commons-logging:commons-logging:1.1.3"));
assertThat(resolved).hasSize(3);
assertThat(resolved).hasSize(4);
assertThat(getNames(resolved)).containsOnly("junit-4.11.jar",
"commons-logging-1.1.3.jar", "hamcrest-core-1.3.jar");
"commons-logging-1.1.3.jar", "hamcrest-core-2.1.jar", "hamcrest-2.1.jar");
}
public Set<String> getNames(Collection<File> files) {

7
spring-boot-project/spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -66,7 +66,7 @@
<groovy.version>2.5.7</groovy.version>
<gson.version>2.8.5</gson.version>
<h2.version>1.4.199</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hamcrest.version>2.1</hamcrest.version>
<hazelcast.version>3.12</hazelcast.version>
<hazelcast-hibernate5.version>1.3.2</hazelcast-hibernate5.version>
<hibernate.version>5.4.2.Final</hibernate.version>
@ -2245,6 +2245,11 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>

16
spring-boot-project/spring-boot-docs/pom.xml
Unescape Escape 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>

9
spring-boot-project/spring-boot-parent/pom.xml
Unescape Escape View File

@ -246,6 +246,12 @@
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@ -264,7 +270,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -583,6 +589,7 @@
<bannedDependencies>
<excludes>
<exclude>com.zaxxer:HikariCP-*</exclude>
<exclude>org.hamcrest:hamcrest-*</exclude>
<exclude>javax.*:*:*</exclude>
</excludes>
<includes>

18
spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml
Unescape Escape View File

@ -42,10 +42,22 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@ -57,11 +69,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>

12
spring-boot-project/spring-boot-test-autoconfigure/pom.xml
Unescape Escape View File

@ -53,6 +53,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>
@ -367,6 +375,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

13
spring-boot-project/spring-boot-test/pom.xml
Unescape Escape View File

@ -54,6 +54,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.apache.httpcomponents</groupId>
@ -67,12 +73,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<optional>true</optional>
</dependency>
<dependency>

12
spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml
Unescape Escape View File

@ -49,11 +49,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@ -118,6 +114,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Test -->
<dependency>

8
spring-boot-project/spring-boot/pom.xml
Unescape Escape View File

@ -115,6 +115,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.apache.commons</groupId>
@ -210,7 +216,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<optional>true</optional>
</dependency>
<dependency>

Write Preview
Loading…
Cancel
Save