From a81cd5df74f83047686da9b8e7d5ed8a574e4a35 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 16 Feb 2016 12:24:39 +0000 Subject: [PATCH] Upgrade to Spring REST Docs 1.1.0.M1 Closes gh-5160 --- .../boot/actuate/hypermedia/EndpointDocumentation.java | 4 ++-- .../boot/actuate/hypermedia/HealthEndpointDocumentation.java | 4 ++-- .../actuate/hypermedia/HypermediaEndpointDocumentation.java | 4 ++-- spring-boot-dependencies/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java index beae9111b1..5cdce852ec 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java @@ -41,7 +41,7 @@ import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint; import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.MediaType; -import org.springframework.restdocs.RestDocumentation; +import org.springframework.restdocs.JUnitRestDocumentation; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -69,7 +69,7 @@ public class EndpointDocumentation { private static final String RESTDOCS_OUTPUT_DIR = "target/generated-snippets"; @Rule - public final RestDocumentation restDocumentation = new RestDocumentation( + public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation( RESTDOCS_OUTPUT_DIR); @Autowired diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java index 492ef7e004..6f842465b6 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.MediaType; -import org.springframework.restdocs.RestDocumentation; +import org.springframework.restdocs.JUnitRestDocumentation; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,7 +47,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class HealthEndpointDocumentation { @Rule - public final RestDocumentation restDocumentation = new RestDocumentation( + public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation( "target/generated-snippets"); @Autowired diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java index a715a645de..bcfde381b7 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.MediaType; -import org.springframework.restdocs.RestDocumentation; +import org.springframework.restdocs.JUnitRestDocumentation; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -46,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class HypermediaEndpointDocumentation { @Rule - public final RestDocumentation restDocumentation = new RestDocumentation( + public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation( "target/generated-snippets"); @Autowired diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 5b3eb4148b..47caff6ae3 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -136,7 +136,7 @@ 1.2.5.RELEASE 1.1.5.RELEASE 1.2.0.RELEASE - 1.0.1.RELEASE + 1.1.0.M1 1.1.2.RELEASE 4.0.3.RELEASE 1.0.3.RELEASE