Commit 788c9ba6 by Johannes Edmeier

Update to Spring Boot 2.0.0.M3

parent cc544df4
......@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.M3</version>
<relativePath/>
</parent>
<groupId>de.codecentric</groupId>
......@@ -34,7 +34,7 @@
<properties>
<java.version>1.8</java.version>
<main.basedir>${basedir}</main.basedir>
<spring-boot.version>2.0.0.BUILD-SNAPSHOT</spring-boot.version>
<spring-boot.version>2.0.0.M3</spring-boot.version>
<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version>
<build-plugin.jacoco.version>0.7.7.201606060606</build-plugin.jacoco.version>
<build-plugin.coveralls.version>4.2.0</build-plugin.coveralls.version>
......
......@@ -94,11 +94,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-json-org</artifactId>
<scope>test</scope>
......@@ -120,10 +115,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
......
......@@ -59,7 +59,8 @@ public class Application implements Serializable {
long version,
Registration registration,
StatusInfo statusInfo,
Info info, Endpoints endpoints,
Info info,
Endpoints endpoints,
List<ClientApplicationEvent> unsavedEvents) {
Assert.notNull(id, "'id' must not be null");
this.id = id;
......
......@@ -65,8 +65,10 @@ public class ApplicationOperations {
public Mono<ClientResponse> exchange(HttpMethod method, Application application, URI uri) {
return webClient.method(method)
.uri(uri).accept(ActuatorMediaTypes.APPLICATION_ACTUATOR_V2_JSON, MediaType.APPLICATION_JSON)
.uri(uri)
.accept(ActuatorMediaTypes.APPLICATION_ACTUATOR_V2_JSON, MediaType.APPLICATION_JSON)
.headers(headers -> headers.putAll(httpHeadersProvider.getHeaders(application)))
.exchange().doOnSubscribe((s) -> log.debug("Do {} on '{}' for {}", method, uri, application));
.exchange()
.doOnSubscribe((s) -> log.debug("Do {} on '{}' for {}", method, uri, application));
}
}
......@@ -62,7 +62,8 @@ public class InfoUpdaterTest {
//given
Registration registration = Registration.create("foo", "http://health").build();
Application application = Application.create(ApplicationId.of("onl"))
.register(registration).withEndpoints(Endpoints.single("info", "info"))
.register(registration)
.withEndpoints(Endpoints.single("info", "info"))
.withStatusInfo(StatusInfo.ofUp());
StepVerifier.create(repository.save(application)).verifyComplete();
......
......@@ -52,7 +52,8 @@ public class ApplicationOperationsTest {
private ApplicationOperations ops = new ApplicationOperations(webClient, headersProvider);
private final Application application = Application.create(ApplicationId.of("id"))
.register(Registration.create("test", "http://health")
.managementUrl("http://mgmt").build())
.managementUrl("http://mgmt")
.build())
.withEndpoints(Endpoints.single("info", "info"));
@Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment