From 397d3e85e81e1a3dcc98d4cb1b4313b4e35238f7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 2 Jan 2018 15:45:43 +0100 Subject: [PATCH 1/2] Fix Windows build Closes gh-11459 --- .../boot/loader/data/RandomAccessDataFileTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java index e6c3aefc47..acd3da0621 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java @@ -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. @@ -106,7 +106,8 @@ public class RandomAccessDataFileTests { @Test public void fileExists() throws Exception { 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")); } @@ -120,7 +121,8 @@ public class RandomAccessDataFileTests { @Test public void fileExistsWithConcurrentReads() throws Exception { 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); } From e187aac93d0080295710c9c4d0dc40ca68947ac4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 2 Jan 2018 15:56:46 +0100 Subject: [PATCH 2/2] Mention that a custom starter must bring the core starter Closes gh-11455 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index e67adefb8c..45ed2704cf 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -6505,6 +6505,11 @@ a proper set of _default_ dependencies may be hard if the number of optional dep is high as you should avoid bringing unnecessary dependencies for a typical usage of the library. +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]]