From 542e935bb6bcaf8476eed78f26686acdb2763588 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Sep 2016 10:03:00 +0200 Subject: [PATCH 1/3] Fix typo Closes gh-7026 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 831758b571..67c616610b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5079,7 +5079,7 @@ configure elements of the auto-configuration you can use the `@AutoConfigureJson annotation. Spring Boot includes AssertJ based helpers that work with the JSONassert and JsonPath -libraries to check that JSON is as expected. The `JacksonHelper`, `GsonHelper` and +libraries to check that JSON is as expected. The `JacksonTester`, `GsonTester` and `BasicJsonTester` classes can be used for Jackson, Gson and Strings respectively. Any helper fields on the test class can be `@Autowired` when using `@JsonTest`. From 723b46ade4d548e08fb2adc3f5bca720f4019b62 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 26 Sep 2016 22:35:00 +0900 Subject: [PATCH 2/3] Move Restarter in integration tests Closes gh-7025 --- .../springframework/boot/devtools/{ => restart}/Restarter.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/{ => restart}/Restarter.java (100%) diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/Restarter.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java similarity index 100% rename from spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/Restarter.java rename to spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java From a2794d75c32d254e9ccac22043b33b23f0e9942e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Sep 2016 10:12:59 +0200 Subject: [PATCH 3/3] Clarify couchbase cache requirements Closes gh-6998 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 67c616610b..c9868670df 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3927,8 +3927,9 @@ Caches can be created on startup via the `spring.cache.cache-names` property. If [[boot-features-caching-provider-couchbase]] ==== Couchbase -If Couchbase is available and <>, a -`CouchbaseCacheManager` is auto-configured. It is also possible to create additional +If the Couchbase java client and the `couchbase-spring-cache` implementation are +available and Couchbase is <>, a +`CouchbaseCacheManager` will be auto-configured. It is also possible to create additional caches on startup using the `spring.cache.cache-names` property. These will operate on the `Bucket` that was auto-configured. You can _also_ create additional caches on another `Bucket` using the customizer: assume you need two caches on the "main" `Bucket` (`foo`