Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-cli/pom.xml
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
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) {