mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
25982ecf69
@ -75,6 +75,9 @@ public class BeansEndpoint extends AbstractEndpoint<List<Object>>
|
||||
|
||||
@Override
|
||||
public String getSnapshotAsJson() {
|
||||
if (this.leafContext == null) {
|
||||
return super.getSnapshotAsJson();
|
||||
}
|
||||
return generateJson(getContextHierarchy());
|
||||
}
|
||||
|
||||
|
@ -28,10 +28,10 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- <dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
</dependency> -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-jdbc</artifactId>
|
||||
|
Loading…
Reference in New Issue
Block a user