Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java

@@ -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());
 		}
 

spring-boot-samples/spring-boot-sample-actuator/pom.xml

@@ -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>