Merge branch '1.5.x'

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

@@ -23,14 +23,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-integration</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

spring-boot-samples/spring-boot-sample-integration/src/main/resources/application.properties

@@ -1,2 +1,2 @@
-logging.level.org.springframework.integration.file: DEBUG
-service.greeting: Hello
+logging.level.org.springframework.integration.file=DEBUG
+service.greeting=Hello