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
2016-12-30 18:01:59 +01:00
parent 22a384ac28 c903ff46a7
commit 4604bb7e8a
48 changed files with 180 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-hypermedia-gson/src/main/resources/application.properties
View File

@@ -1,2 +1,4 @@
# management.context-path=/admin
spring.http.converters.preferred-json-mapper: gson
management.security.enabled=false
spring.http.converters.preferred-json-mapper=gson

3
spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java
View File

@@ -35,8 +35,7 @@ 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")
public class SampleHypermediaGsonApplicationTests {
@Autowired