Enable configuration properties scanning in smoke tests that need it

Closes gh-18674
spring-projects · Nov 4, 2019 · 8c07733 · 8c07733 · dreis2211 · Nov 4, 2019
1 parent ea5fa2c
commit 8c07733
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/...actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java b/...actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java
@@ -18,8 +18,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class SampleActuatorNoWebApplication {
 
 	public static void main(String[] args) {

diff --git a/...-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java b/...-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java
@@ -20,9 +20,11 @@
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class SampleActuatorApplication {
 
 	public static void main(String[] args) {

diff --git a/...ation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java b/...ation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java
@@ -19,10 +19,12 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.validation.Validator;
 
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class SamplePropertyValidationApplication implements CommandLineRunner {
 
 	private final SampleProperties properties;

diff --git a/...tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java b/...tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java
@@ -18,13 +18,15 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
 /**
  * Sample application to demonstrate testing.
  *
  * @author Phillip Webb
  */
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class SampleTestApplication {
 
 	// NOTE: this application will intentionally not start without MySQL, the test will