Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-boot-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-boot-admin
Commits
788c9ba6
Commit
788c9ba6
authored
Aug 27, 2017
by
Johannes Edmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Spring Boot 2.0.0.M3
parent
cc544df4
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
16 deletions
+12
-16
pom.xml
pom.xml
+2
-2
pom.xml
spring-boot-admin-server/pom.xml
+0
-9
Application.java
...entric/boot/admin/server/domain/entities/Application.java
+2
-1
ApplicationOperations.java
...c/boot/admin/server/web/client/ApplicationOperations.java
+4
-2
InfoUpdaterTest.java
...decentric/boot/admin/server/services/InfoUpdaterTest.java
+2
-1
ApplicationOperationsTest.java
...ot/admin/server/web/client/ApplicationOperationsTest.java
+2
-1
No files found.
pom.xml
View file @
788c9ba6
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<parent>
<parent>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-parent
</artifactId>
<artifactId>
spring-boot-starter-parent
</artifactId>
<version>
2.0.0.
BUILD-SNAPSHOT
</version>
<version>
2.0.0.
M3
</version>
<relativePath/>
<relativePath/>
</parent>
</parent>
<groupId>
de.codecentric
</groupId>
<groupId>
de.codecentric
</groupId>
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<properties>
<properties>
<java.version>
1.8
</java.version>
<java.version>
1.8
</java.version>
<main.basedir>
${basedir}
</main.basedir>
<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>
<spring-cloud.version>
Finchley.BUILD-SNAPSHOT
</spring-cloud.version>
<build-plugin.jacoco.version>
0.7.7.201606060606
</build-plugin.jacoco.version>
<build-plugin.jacoco.version>
0.7.7.201606060606
</build-plugin.jacoco.version>
<build-plugin.coveralls.version>
4.2.0
</build-plugin.coveralls.version>
<build-plugin.coveralls.version>
4.2.0
</build-plugin.coveralls.version>
...
...
spring-boot-admin-server/pom.xml
View file @
788c9ba6
...
@@ -94,11 +94,6 @@
...
@@ -94,11 +94,6 @@
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<artifactId>
jackson-datatype-json-org
</artifactId>
<artifactId>
jackson-datatype-json-org
</artifactId>
<scope>
test
</scope>
<scope>
test
</scope>
...
@@ -120,10 +115,6 @@
...
@@ -120,10 +115,6 @@
<classifier>
tests
</classifier>
<classifier>
tests
</classifier>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-actuator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<finalName>
${project.artifactId}
</finalName>
<finalName>
${project.artifactId}
</finalName>
...
...
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/entities/Application.java
View file @
788c9ba6
...
@@ -59,7 +59,8 @@ public class Application implements Serializable {
...
@@ -59,7 +59,8 @@ public class Application implements Serializable {
long
version
,
long
version
,
Registration
registration
,
Registration
registration
,
StatusInfo
statusInfo
,
StatusInfo
statusInfo
,
Info
info
,
Endpoints
endpoints
,
Info
info
,
Endpoints
endpoints
,
List
<
ClientApplicationEvent
>
unsavedEvents
)
{
List
<
ClientApplicationEvent
>
unsavedEvents
)
{
Assert
.
notNull
(
id
,
"'id' must not be null"
);
Assert
.
notNull
(
id
,
"'id' must not be null"
);
this
.
id
=
id
;
this
.
id
=
id
;
...
...
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/client/ApplicationOperations.java
View file @
788c9ba6
...
@@ -65,8 +65,10 @@ public class ApplicationOperations {
...
@@ -65,8 +65,10 @@ public class ApplicationOperations {
public
Mono
<
ClientResponse
>
exchange
(
HttpMethod
method
,
Application
application
,
URI
uri
)
{
public
Mono
<
ClientResponse
>
exchange
(
HttpMethod
method
,
Application
application
,
URI
uri
)
{
return
webClient
.
method
(
method
)
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
)))
.
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
));
}
}
}
}
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/InfoUpdaterTest.java
View file @
788c9ba6
...
@@ -62,7 +62,8 @@ public class InfoUpdaterTest {
...
@@ -62,7 +62,8 @@ public class InfoUpdaterTest {
//given
//given
Registration
registration
=
Registration
.
create
(
"foo"
,
"http://health"
).
build
();
Registration
registration
=
Registration
.
create
(
"foo"
,
"http://health"
).
build
();
Application
application
=
Application
.
create
(
ApplicationId
.
of
(
"onl"
))
Application
application
=
Application
.
create
(
ApplicationId
.
of
(
"onl"
))
.
register
(
registration
).
withEndpoints
(
Endpoints
.
single
(
"info"
,
"info"
))
.
register
(
registration
)
.
withEndpoints
(
Endpoints
.
single
(
"info"
,
"info"
))
.
withStatusInfo
(
StatusInfo
.
ofUp
());
.
withStatusInfo
(
StatusInfo
.
ofUp
());
StepVerifier
.
create
(
repository
.
save
(
application
)).
verifyComplete
();
StepVerifier
.
create
(
repository
.
save
(
application
)).
verifyComplete
();
...
...
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/client/ApplicationOperationsTest.java
View file @
788c9ba6
...
@@ -52,7 +52,8 @@ public class ApplicationOperationsTest {
...
@@ -52,7 +52,8 @@ public class ApplicationOperationsTest {
private
ApplicationOperations
ops
=
new
ApplicationOperations
(
webClient
,
headersProvider
);
private
ApplicationOperations
ops
=
new
ApplicationOperations
(
webClient
,
headersProvider
);
private
final
Application
application
=
Application
.
create
(
ApplicationId
.
of
(
"id"
))
private
final
Application
application
=
Application
.
create
(
ApplicationId
.
of
(
"id"
))
.
register
(
Registration
.
create
(
"test"
,
"http://health"
)
.
register
(
Registration
.
create
(
"test"
,
"http://health"
)
.
managementUrl
(
"http://mgmt"
).
build
())
.
managementUrl
(
"http://mgmt"
)
.
build
())
.
withEndpoints
(
Endpoints
.
single
(
"info"
,
"info"
));
.
withEndpoints
(
Endpoints
.
single
(
"info"
,
"info"
));
@Test
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment