Merge branch '1.5.x'

bfe2f85a · Andy Wilkinson · bb9396e3 · 054ce286 · bfe2f85a
Commit bfe2f85a authored Nov 03, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ConfigurationPropertiesBinderBuilder.java ...text/properties/ConfigurationPropertiesBinderBuilder.java +2 -1

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilder.java
@@ -53,7 +53,8 @@ public class ConfigurationPropertiesBinderBuilder {
 	public static final String CONVERSION_SERVICE_BEAN_NAME = ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;

 	private static final String[] VALIDATOR_CLASSES = { "javax.validation.Validator",
-			"javax.validation.ValidatorFactory" };
+			"javax.validation.ValidatorFactory",
+			"javax.validation.bootstrap.GenericBootstrap" };

 	private final ApplicationContext applicationContext;