Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-12-19 13:21:18 -08:00
362 changed files with 664 additions and 132 deletions

View File

@@ -35,7 +35,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringRunner.class)
@SpringBootTest
@TestPropertySource(properties = {"endpoints.hypermedia.enabled: true", "management.security.enabled: false"})
@TestPropertySource(properties = { "endpoints.hypermedia.enabled: true",
"management.security.enabled: false" })
public class SampleHypermediaGsonApplicationTests {
@Autowired