Merge branch '2.1.x'

This commit is contained in:
Madhura Bhave
2019-07-10 18:26:25 -07:00
3 changed files with 23 additions and 13 deletions

View File

@@ -63,13 +63,6 @@ class EndpointsPropertiesSampleActuatorApplicationTests {
assertThat(entity.getBody()).contains("\"hello\":\"world\"");
}
@Test
void logfileWithRandomName() {
ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
.getForEntity("/admin/logfile", String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
}
private String getPassword() {
return "password";
}

View File

@@ -1,5 +1,3 @@
server.error.path: /oops
management.endpoint.health.show-details: always
management.endpoints.web.base-path: /admin
logging.file=./target/${spring.application.instance_id}.log
spring.application.instance_id=${random.value}
server.error.path:/oops
management.endpoint.health.show-details:always
management.endpoints.web.base-path:/admin