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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-01-02 15:58:49 +01:00
parent 6277d0ceb7 e187aac93d
commit f0b210c751
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -7230,6 +7230,11 @@ dependencies is high, as you should avoid including dependencies that are unnece
a typical usage of the library. In other words, you should not include optional
dependencies.
NOTE: Either way, your starter must reference the core Spring Boot starter
(`spring-boot-starter`) directly or indirectly (i.e. no need to add it if your starter
relies on another starter). If a project is created with only your custom starter, Spring
Boot's core features will be honoured by the presence of the core starter.
[[boot-features-whats-next]]

8
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -103,7 +103,8 @@ public class RandomAccessDataFileTests {
@Test
public void fileExists() {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("File /does/not/exist must exist");
this.thrown.expectMessage(String.format("File %s must exist",
new File("/does/not/exist").getAbsolutePath()));
new RandomAccessDataFile(new File("/does/not/exist"));
}
@@ -117,7 +118,8 @@ public class RandomAccessDataFileTests {
@Test
public void fileExistsWithConcurrentReads() {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("File /does/not/exist must exist");
this.thrown.expectMessage(String.format("File %s must exist",
new File("/does/not/exist").getAbsolutePath()));
new RandomAccessDataFile(new File("/does/not/exist"), 1);
}