Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryAuthorizationException.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryHealthMvcEndpoint.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,10 +117,9 @@ class CloudFoundrySecurityService {
 
 	private Map<String, String> extractTokenKeys(Map<?, ?> response) {
 		Map<String, String> tokenKeys = new HashMap<String, String>();
-		List<?> keys = (List<?>) response.get("keys");
-		for (Object key : keys) {
+		for (Object key : (List<?>) response.get("keys")) {
 			Map<?, ?> tokenKey = (Map<?, ?>) key;
-			tokenKeys.put((String) (tokenKey).get("kid"), (String) (tokenKey).get("value"));
+			tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value"));
 		}
 		return tokenKeys;
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/Token.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,7 +97,6 @@ class Token {
 		return getRequired(this.claims, "scope", List.class);
 	}
 
-	@SuppressWarnings("unchecked")
 	public String getKeyId() {
 		return getRequired(this.header, "kid", String.class);
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/TokenValidator.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,8 +52,6 @@ class TokenValidator {
 		validateAudience(token);
 	}
 
-
-
 	private void validateAlgorithm(Token token) {
 		String algorithm = token.getSignatureAlgorithm();
 		if (algorithm == null) {
@@ -83,9 +81,9 @@ class TokenValidator {
 		}
 	}
 
-	private boolean hasValidKeyId(String tokenKeyId) {
-		for (String keyId: this.tokenKeys.keySet()) {
-			if (tokenKeyId.equals(keyId)) {
+	private boolean hasValidKeyId(String tokenKey) {
+		for (String candidate : this.tokenKeys.keySet()) {
+			if (tokenKey.equals(candidate)) {
 				return true;
 			}
 		}

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

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java

 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,7 +85,8 @@ public class TokenValidatorTests {
 	private static final Map<String, String> INVALID_KEYS = Collections
 			.singletonMap("invalid-key", INVALID_KEY);
 
-	private static final Map<String, String> VALID_KEYS = Collections.singletonMap("valid-key", VALID_KEY);
+	private static final Map<String, String> VALID_KEYS = Collections
+			.singletonMap("valid-key", VALID_KEY);
 
 	@Before
 	public void setup() throws Exception {
@@ -100,8 +101,8 @@ public class TokenValidatorTests {
 		given(this.securityService.fetchTokenKeys()).willReturn(INVALID_KEYS);
 		String header = "{\"alg\": \"RS256\",  \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
 		String claims = "{\"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\", \"scope\": [\"actuator.read\"]}";
-		this.thrown.expect(
-				AuthorizationExceptionMatcher.withReason(Reason.INVALID_KEY_ID));
+		this.thrown
+				.expect(AuthorizationExceptionMatcher.withReason(Reason.INVALID_KEY_ID));
 		this.tokenValidator.validate(
 				new Token(getSignedToken(header.getBytes(), claims.getBytes())));
 	}
@@ -131,8 +132,7 @@ public class TokenValidatorTests {
 	}
 
 	@Test
-	public void validateTokenWhenValidShouldNotFetchTokenKeys()
-			throws Exception {
+	public void validateTokenWhenValidShouldNotFetchTokenKeys() throws Exception {
 		ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys", VALID_KEYS);
 		given(this.securityService.getUaaUrl()).willReturn("http://localhost:8080/uaa");
 		String header = "{ \"alg\": \"RS256\",  \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
@@ -144,7 +144,8 @@ public class TokenValidatorTests {
 
 	@Test
 	public void validateTokenWhenSignatureInvalidShouldThrowException() throws Exception {
-		ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys", Collections.singletonMap("valid-key", INVALID_KEY));
+		ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys",
+				Collections.singletonMap("valid-key", INVALID_KEY));
 		given(this.securityService.getUaaUrl()).willReturn("http://localhost:8080/uaa");
 		String header = "{ \"alg\": \"RS256\",  \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
 		String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\", \"scope\": [\"actuator.read\"]}";

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointDisabledIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointVanillaIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpointTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/InfoMvcEndpointWithNoInfoContributorsTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java

@@ -109,24 +109,7 @@ public class EmbeddedLdapAutoConfiguration {
 					this.embeddedProperties.getCredential().getUsername(),
 					this.embeddedProperties.getCredential().getPassword());
 		}
-
-		if (!this.embeddedProperties.getValidation().isEnabled()) {
-			config.setSchema(null);
-		}
-		else {
-			Resource schema = this.embeddedProperties.getValidation().getSchema();
-			if (schema != null) {
-				try {
-					config.setSchema(Schema.mergeSchemas(Schema.getDefaultStandardSchema(),
-							Schema.getSchema(schema.getInputStream())));
-				}
-				catch (Exception ex) {
-					throw new IllegalStateException(
-							"Unable to load schema " + schema.getDescription(), ex);
-				}
-			}
-		}
-
+		setSchema(config);
 		InMemoryListenerConfig listenerConfig = InMemoryListenerConfig
 				.createLDAPConfig("LDAP", this.embeddedProperties.getPort());
 		config.setListenerConfigs(listenerConfig);
@@ -137,6 +120,29 @@ public class EmbeddedLdapAutoConfiguration {
 		return this.server;
 	}
 
+	private void setSchema(InMemoryDirectoryServerConfig config) {
+		if (!this.embeddedProperties.getValidation().isEnabled()) {
+			config.setSchema(null);
+			return;
+		}
+		Resource schema = this.embeddedProperties.getValidation().getSchema();
+		if (schema != null) {
+			setSchema(config, schema);
+		}
+	}
+
+	private void setSchema(InMemoryDirectoryServerConfig config, Resource resource) {
+		try {
+			Schema defaultSchema = Schema.getDefaultStandardSchema();
+			Schema schema = Schema.getSchema(resource.getInputStream());
+			config.setSchema(Schema.mergeSchemas(defaultSchema, schema));
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException(
+					"Unable to load schema " + resource.getDescription(), ex);
+		}
+	}
+
 	private boolean hasCredentials(Credential credential) {
 		return StringUtils.hasText(credential.getUsername())
 				&& StringUtils.hasText(credential.getPassword());

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java

@@ -203,31 +203,36 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
 			return;
 		}
 		ResourceServerProperties resource = (ResourceServerProperties) target;
+		validate(resource, errors);
 
+	}
+
+	private void validate(ResourceServerProperties target, Errors errors) {
 		if ((StringUtils.hasText(this.jwt.getKeyUri())
 				|| StringUtils.hasText(this.jwt.getKeyValue()))
 				&& StringUtils.hasText(this.jwk.getKeySetUri())) {
-			errors.reject("ambiguous.keyUri", "Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
+			errors.reject("ambiguous.keyUri",
+					"Only one of jwt.keyUri (or jwt.keyValue) and "
+							+ "jwk.keySetUri should be configured.");
 		}
-
 		else {
 			if (StringUtils.hasText(this.clientId)) {
 				if (!StringUtils.hasText(this.clientSecret)) {
-					if (!StringUtils.hasText(resource.getUserInfoUri())) {
+					if (!StringUtils.hasText(target.getUserInfoUri())) {
 						errors.rejectValue("userInfoUri", "missing.userInfoUri",
 								"Missing userInfoUri (no client secret available)");
 					}
 				}
 				else {
 					if (isPreferTokenInfo()
-							&& !StringUtils.hasText(resource.getTokenInfoUri())) {
+							&& !StringUtils.hasText(target.getTokenInfoUri())) {
 						if (StringUtils.hasText(getJwt().getKeyUri())
 								|| StringUtils.hasText(getJwt().getKeyValue())
 								|| StringUtils.hasText(getJwk().getKeySetUri())) {
 							// It's a JWT decoder
 							return;
 						}
-						if (!StringUtils.hasText(resource.getUserInfoUri())) {
+						if (!StringUtils.hasText(target.getUserInfoUri())) {
 							errors.rejectValue("tokenInfoUri", "missing.tokenInfoUri",
 									"Missing tokenInfoUri and userInfoUri and there is no "
 											+ "JWT verifier key");
@@ -236,7 +241,6 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
 				}
 			}
 		}
-
 	}
 
 	private int countBeans(Class<?> type) {
@@ -294,9 +298,8 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
 	public class Jwk {
 
 		/**
-		 * The URI to get verification keys to verify the JWT token.
-		 * This can be set when the authorization server returns a
-		 * set of verification keys.
+		 * The URI to get verification keys to verify the JWT token. This can be set when
+		 * the authorization server returns a set of verification keys.
 		 */
 		private String keySetUri;
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -46,11 +46,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.ResourceProperties.Strategy;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.validation.MessageInterpolatorFactory;
 import org.springframework.boot.web.filter.OrderedHiddenHttpMethodFilter;
 import org.springframework.boot.web.filter.OrderedHttpPutFormContentFilter;
 import org.springframework.boot.web.filter.OrderedRequestContextFilter;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -70,8 +68,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.DefaultMessageCodesResolver;
 import org.springframework.validation.MessageCodesResolver;
 import org.springframework.validation.Validator;
-import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean;
-import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.context.request.RequestContextListener;
@@ -134,8 +130,6 @@ public class WebMvcAutoConfiguration {
 
 	public static String DEFAULT_SUFFIX = "";
 
-	private static final String JSR303_VALIDATOR_CLASS = "javax.validation.Validator";
-
 	@Bean
 	@ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
 	public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
@@ -406,17 +400,12 @@ public class WebMvcAutoConfiguration {
 		@Bean
 		@Override
 		public Validator mvcValidator() {
-			if (isJsr303Present()) {
-				Validator userDefinedValidator = getValidator();
-				return new Jsr303ValidatorHandler(getApplicationContext(),
-						userDefinedValidator).wrapJsr303Validator();
+			if (!ClassUtils.isPresent("javax.validation.Validator",
+					getClass().getClassLoader())) {
+				return super.mvcValidator();
 			}
-			return super.mvcValidator();
-		}
-
-		private boolean isJsr303Present() {
-			return ClassUtils.isPresent(JSR303_VALIDATOR_CLASS,
-					getApplicationContext().getClassLoader());
+			return WebMvcValidator.get(getApplicationContext(),
+					getValidator());
 		}
 
 		@Override
@@ -560,60 +549,4 @@ public class WebMvcAutoConfiguration {
 
 	}
 
-	static class Jsr303ValidatorHandler {
-
-		private final ApplicationContext applicationContext;
-
-		private final Validator userDefinedValidator;
-
-		Jsr303ValidatorHandler(ApplicationContext applicationContext,
-				Validator userDefinedValidator) {
-			this.applicationContext = applicationContext;
-			this.userDefinedValidator = userDefinedValidator;
-		}
-
-		public Validator wrapJsr303Validator() {
-			try {
-				if (this.userDefinedValidator != null) {
-					if (this.userDefinedValidator instanceof javax.validation.Validator) {
-						return wrap((javax.validation.Validator) this.userDefinedValidator, false);
-					}
-					else {
-						return this.userDefinedValidator;
-					}
-				}
-				else {
-					return wrap(this.applicationContext.getBean(
-							javax.validation.Validator.class), true);
-				}
-			}
-			catch (NoSuchBeanDefinitionException ex) {
-				OptionalValidatorFactoryBean factory = new OptionalValidatorFactoryBean();
-				MessageInterpolatorFactory interpolatorFactory = new MessageInterpolatorFactory();
-				factory.setMessageInterpolator(interpolatorFactory.getObject());
-				return new SpringValidatorAdapterWrapper(factory, false);
-			}
-
-		}
-
-		/**
-		 * Wrap the specified {@code validator}.
-		 * @param validator the validator to wrap
-		 * @param bean {@code true} if the specified {@code validator} is a bean managed
-		 * in the context
-		 * @return a {@link Validator} wrapping the specified argument
-		 */
-		private Validator wrap(javax.validation.Validator validator, boolean bean) {
-			if (validator instanceof SpringValidatorAdapter) {
-				return new SpringValidatorAdapterWrapper(
-						(SpringValidatorAdapter) validator, bean);
-			}
-			else {
-				return new SpringValidatorAdapterWrapper(
-						new SpringValidatorAdapter(validator), false);
-			}
-		}
-
-	}
-
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/SpringValidatorAdapterWrapper.java → spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcValidator.java

@@ -19,31 +19,38 @@ package org.springframework.boot.autoconfigure.web;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.validation.MessageInterpolatorFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.validation.Errors;
+import org.springframework.validation.SmartValidator;
 import org.springframework.validation.Validator;
+import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean;
 import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
 
 /**
- * Wraps a {@link SpringValidatorAdapter} so that only the Spring's {@link Validator}
+ * A {@link SmartValidator} exposed as a bean for WebMvc use. Wraps existing
+ * {@link SpringValidatorAdapter} instances so that only the Spring's {@link Validator}
  * type is exposed. This prevents such a bean to expose both the Spring and JSR-303
  * validator contract at the same time.
  *
  * @author Stephane Nicoll
+ * @author Phillip Webb
  */
-class SpringValidatorAdapterWrapper
-		implements Validator, ApplicationContextAware, InitializingBean, DisposableBean {
+class WebMvcValidator implements SmartValidator, ApplicationContextAware,
+		InitializingBean, DisposableBean {
 
 	private final SpringValidatorAdapter target;
-	private final boolean managed;
 
-	SpringValidatorAdapterWrapper(SpringValidatorAdapter target, boolean managed) {
+	private final boolean existingBean;
+
+	WebMvcValidator(SpringValidatorAdapter target, boolean existingBean) {
 		this.target = target;
-		this.managed = managed;
+		this.existingBean = existingBean;
 	}
 
-	public SpringValidatorAdapter getTarget() {
+	SpringValidatorAdapter getTarget() {
 		return this.target;
 	}
 
@@ -57,27 +64,81 @@ class SpringValidatorAdapterWrapper
 		this.target.validate(target, errors);
 	}
 
+	@Override
+	public void validate(Object target, Errors errors, Object... validationHints) {
+		this.target.validate(target, errors, validationHints);
+	}
+
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext)
 			throws BeansException {
-		if (!this.managed && this.target instanceof ApplicationContextAware) {
-			((ApplicationContextAware) this.target).setApplicationContext(
-					applicationContext);
+		if (!this.existingBean && this.target instanceof ApplicationContextAware) {
+			((ApplicationContextAware) this.target)
+					.setApplicationContext(applicationContext);
 		}
 	}
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		if (!this.managed && this.target instanceof InitializingBean) {
+		if (!this.existingBean && this.target instanceof InitializingBean) {
 			((InitializingBean) this.target).afterPropertiesSet();
 		}
 	}
 
 	@Override
 	public void destroy() throws Exception {
-		if (!this.managed && this.target instanceof DisposableBean) {
+		if (!this.existingBean && this.target instanceof DisposableBean) {
 			((DisposableBean) this.target).destroy();
 		}
 	}
 
+	public static Validator get(ApplicationContext applicationContext,
+			Validator validator) {
+		if (validator != null) {
+			return wrap(validator, false);
+		}
+		return getExistingOrCreate(applicationContext);
+	}
+
+	private static Validator getExistingOrCreate(ApplicationContext applicationContext) {
+		Validator existing = getExisting(applicationContext);
+		if (existing != null) {
+			return wrap(existing, true);
+		}
+		return create();
+	}
+
+	private static Validator getExisting(ApplicationContext applicationContext) {
+		try {
+			javax.validation.Validator validator = applicationContext
+					.getBean(javax.validation.Validator.class);
+			if (validator instanceof Validator) {
+				return (Validator) validator;
+			}
+			return new SpringValidatorAdapter(validator);
+		}
+		catch (NoSuchBeanDefinitionException ex) {
+			return null;
+		}
+	}
+
+	private static Validator create() {
+		OptionalValidatorFactoryBean validator = new OptionalValidatorFactoryBean();
+		validator.setMessageInterpolator(new MessageInterpolatorFactory().getObject());
+		return wrap(validator, false);
+	}
+
+	private static Validator wrap(Validator validator, boolean existingBean) {
+		if (validator instanceof javax.validation.Validator) {
+			if (validator instanceof SpringValidatorAdapter) {
+				return new WebMvcValidator((SpringValidatorAdapter) validator,
+						existingBean);
+			}
+			return new WebMvcValidator(
+					new SpringValidatorAdapter((javax.validation.Validator) validator),
+					existingBean);
+		}
+		return validator;
+	}
+
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java

@@ -32,11 +32,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class GroovyTemplateAvailabilityProviderTests {
 
-	private final TemplateAvailabilityProvider provider = new GroovyTemplateAvailabilityProvider();
+	private TemplateAvailabilityProvider provider = new GroovyTemplateAvailabilityProvider();
 
-	private final ResourceLoader resourceLoader = new DefaultResourceLoader();
+	private ResourceLoader resourceLoader = new DefaultResourceLoader();
 
-	private final MockEnvironment environment = new MockEnvironment();
+	private MockEnvironment environment = new MockEnvironment();
 
 	@Test
 	public void availabilityOfTemplateInDefaultLocation() {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java

@@ -389,11 +389,13 @@ public class OAuth2AutoConfigurationTests {
 	}
 
 	@Test
-	public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch() throws Exception {
+	public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch()
+			throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
 		EnvironmentTestUtils.addEnvironment(this.context,
 				"security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys");
-		this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class);
+		this.context.register(ResourceServerConfiguration.class,
+				MinimalSecureWebApplication.class);
 		this.context.refresh();
 		assertThat(countBeans(RESOURCE_SERVER_CONFIG)).isEqualTo(1);
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,13 +68,15 @@ public class ResourceServerPropertiesTests {
 	}
 
 	@Test
-	public void validateWhenBothJwtAndJwtKeyConfigurationPresentShouldFail() throws Exception {
+	public void validateWhenBothJwtAndJwtKeyConfigurationPresentShouldFail()
+			throws Exception {
 		this.properties.getJwk().setKeySetUri("http://my-auth-server/token_keys");
 		this.properties.getJwt().setKeyUri("http://my-auth-server/token_key");
 		setListableBeanFactory();
 		Errors errors = mock(Errors.class);
 		this.properties.validate(this.properties, errors);
-		verify(errors).reject("ambiguous.keyUri", "Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
+		verify(errors).reject("ambiguous.keyUri",
+				"Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
 
 	}
 
@@ -89,14 +91,19 @@ public class ResourceServerPropertiesTests {
 
 	private void setListableBeanFactory() {
 		ListableBeanFactory beanFactory = new StaticWebApplicationContext() {
+
 			@Override
-			public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
-				if (type.isAssignableFrom(ResourceServerTokenServicesConfiguration.class)) {
-					return new String[]{"ResourceServerTokenServicesConfiguration"};
+			public String[] getBeanNamesForType(Class<?> type,
+					boolean includeNonSingletons, boolean allowEagerInit) {
+				if (type.isAssignableFrom(
+						ResourceServerTokenServicesConfiguration.class)) {
+					return new String[] { "ResourceServerTokenServicesConfiguration" };
 				}
 				return new String[0];
 			}
+
 		};
 		this.properties.setBeanFactory(beanFactory);
 	}
+
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerIntegrationTests.java

@@ -17,9 +17,13 @@
 package org.springframework.boot.autoconfigure.web;
 
 import java.io.File;
+import java.net.URL;
 
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -38,6 +42,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -70,6 +75,14 @@ public class DefaultServletContainerCustomizerIntegrationTests {
 		}
 	}
 
+	@BeforeClass
+	@AfterClass
+	public static void uninstallUrlStreamHandlerFactory() {
+		ReflectionTestUtils.setField(TomcatURLStreamHandlerFactory.class, "instance",
+				null);
+		ReflectionTestUtils.setField(URL.class, "factory", null);
+	}
+
 	@Test
 	public void createFromConfigClass() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,14 @@
 package org.springframework.boot.autoconfigure.web;
 
 import java.net.URI;
+import java.net.URL;
 
 import javax.servlet.MultipartConfigElement;
 
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -76,6 +80,14 @@ public class MultipartAutoConfigurationTests {
 		}
 	}
 
+	@BeforeClass
+	@AfterClass
+	public static void uninstallUrlStreamHandlerFactory() {
+		ReflectionTestUtils.setField(TomcatURLStreamHandlerFactory.class, "instance",
+				null);
+		ReflectionTestUtils.setField(URL.class, "factory", null);
+	}
+
 	@Test
 	public void containerWithNothing() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext(

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java

@@ -662,8 +662,8 @@ public class WebMvcAutoConfigurationTests {
 				.isEmpty();
 		assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1);
 		Validator validator = this.context.getBean(Validator.class);
-		assertThat(validator).isSameAs(this.context.getBean(MvcValidator.class)
-				.validator);
+		assertThat(validator)
+				.isSameAs(this.context.getBean(MvcValidator.class).validator);
 	}
 
 	@Test
@@ -674,8 +674,8 @@ public class WebMvcAutoConfigurationTests {
 				.isEmpty();
 		assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1);
 		Validator validator = this.context.getBean(Validator.class);
-		assertThat(validator).isInstanceOf(SpringValidatorAdapterWrapper.class);
-		assertThat(((SpringValidatorAdapterWrapper) validator).getTarget())
+		assertThat(validator).isInstanceOf(WebMvcValidator.class);
+		assertThat(((WebMvcValidator) validator).getTarget())
 				.isSameAs(this.context.getBean(MvcJsr303Validator.class).validator);
 	}
 
@@ -687,8 +687,8 @@ public class WebMvcAutoConfigurationTests {
 				.hasSize(1);
 		assertThat(this.context.getBeansOfType(Validator.class)).hasSize(2);
 		Validator validator = this.context.getBean("mvcValidator", Validator.class);
-		assertThat(validator).isInstanceOf(SpringValidatorAdapterWrapper.class);
-		assertThat(((SpringValidatorAdapterWrapper) validator).getTarget())
+		assertThat(validator).isInstanceOf(WebMvcValidator.class);
+		assertThat(((WebMvcValidator) validator).getTarget())
 				.isSameAs(this.context.getBean(javax.validation.Validator.class));
 	}
 
@@ -700,8 +700,8 @@ public class WebMvcAutoConfigurationTests {
 				.hasSize(1);
 		assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1);
 		Validator validator = this.context.getBean(Validator.class);
-		assertThat(validator).isInstanceOf(SpringValidatorAdapterWrapper.class);
-		SpringValidatorAdapter target = ((SpringValidatorAdapterWrapper) validator)
+		assertThat(validator).isInstanceOf(WebMvcValidator.class);
+		SpringValidatorAdapter target = ((WebMvcValidator) validator)
 				.getTarget();
 		assertThat(new DirectFieldAccessor(target).getPropertyValue("targetValidator"))
 				.isSameAs(this.context.getBean(javax.validation.Validator.class));
@@ -900,7 +900,7 @@ public class WebMvcAutoConfigurationTests {
 	@Configuration
 	protected static class MvcJsr303Validator extends WebMvcConfigurerAdapter {
 
-		private final LocalValidatorFactoryBean  validator = new LocalValidatorFactoryBean();
+		private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 
 		@Override
 		public Validator getValidator() {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/SpringValidatorAdapterWrapperTests.java → spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java

@@ -37,11 +37,11 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 /**
- * Tests for {@link SpringValidatorAdapterWrapper}.
+ * Tests for {@link WebMvcValidator}.
  *
  * @author Stephane Nicoll
  */
-public class SpringValidatorAdapterWrapperTests {
+public class WebMvcValidatorTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -54,11 +54,11 @@ public class SpringValidatorAdapterWrapperTests {
 
 	@Test
 	public void wrapLocalValidatorFactoryBean() {
-		SpringValidatorAdapterWrapper wrapper = load(
+		WebMvcValidator wrapper = load(
 				LocalValidatorFactoryBeanConfig.class);
 		assertThat(wrapper.supports(SampleData.class)).isTrue();
-		MapBindingResult errors = new MapBindingResult(
-				new HashMap<String, Object>(), "test");
+		MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(),
+				"test");
 		wrapper.validate(new SampleData(40), errors);
 		assertThat(errors.getErrorCount()).isEqualTo(1);
 	}
@@ -66,8 +66,8 @@ public class SpringValidatorAdapterWrapperTests {
 	@Test
 	public void wrapperInvokesCallbackOnNonManagedBean() {
 		load(NonManagedBeanConfig.class);
-		LocalValidatorFactoryBean validator = this.context.getBean(
-				NonManagedBeanConfig.class).validator;
+		LocalValidatorFactoryBean validator = this.context
+				.getBean(NonManagedBeanConfig.class).validator;
 		verify(validator, times(1)).setApplicationContext(any(ApplicationContext.class));
 		verify(validator, times(1)).afterPropertiesSet();
 		verify(validator, times(0)).destroy();
@@ -79,8 +79,8 @@ public class SpringValidatorAdapterWrapperTests {
 	@Test
 	public void wrapperDoesNotInvokeCallbackOnManagedBean() {
 		load(ManagedBeanConfig.class);
-		LocalValidatorFactoryBean validator = this.context.getBean(
-				ManagedBeanConfig.class).validator;
+		LocalValidatorFactoryBean validator = this.context
+				.getBean(ManagedBeanConfig.class).validator;
 		verify(validator, times(0)).setApplicationContext(any(ApplicationContext.class));
 		verify(validator, times(0)).afterPropertiesSet();
 		verify(validator, times(0)).destroy();
@@ -89,12 +89,12 @@ public class SpringValidatorAdapterWrapperTests {
 		verify(validator, times(0)).destroy();
 	}
 
-	private SpringValidatorAdapterWrapper load(Class<?> config) {
+	private WebMvcValidator load(Class<?> config) {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(config);
 		ctx.refresh();
 		this.context = ctx;
-		return this.context.getBean(SpringValidatorAdapterWrapper.class);
+		return this.context.getBean(WebMvcValidator.class);
 	}
 
 	@Configuration
@@ -106,8 +106,8 @@ public class SpringValidatorAdapterWrapperTests {
 		}
 
 		@Bean
-		public SpringValidatorAdapterWrapper wrapper() {
-			return new SpringValidatorAdapterWrapper(validator(), true);
+		public WebMvcValidator wrapper() {
+			return new WebMvcValidator(validator(), true);
 		}
 
 	}
@@ -115,12 +115,12 @@ public class SpringValidatorAdapterWrapperTests {
 	@Configuration
 	static class NonManagedBeanConfig {
 
-		private final LocalValidatorFactoryBean validator
-				= mock(LocalValidatorFactoryBean.class);
+		private final LocalValidatorFactoryBean validator = mock(
+				LocalValidatorFactoryBean.class);
 
 		@Bean
-		public SpringValidatorAdapterWrapper wrapper() {
-			return new SpringValidatorAdapterWrapper(this.validator, false);
+		public WebMvcValidator wrapper() {
+			return new WebMvcValidator(this.validator, false);
 		}
 
 	}
@@ -128,12 +128,12 @@ public class SpringValidatorAdapterWrapperTests {
 	@Configuration
 	static class ManagedBeanConfig {
 
-		private final LocalValidatorFactoryBean validator
-				= mock(LocalValidatorFactoryBean.class);
+		private final LocalValidatorFactoryBean validator = mock(
+				LocalValidatorFactoryBean.class);
 
 		@Bean
-		public SpringValidatorAdapterWrapper wrapper() {
-			return new SpringValidatorAdapterWrapper(this.validator, true);
+		public WebMvcValidator wrapper() {
+			return new WebMvcValidator(this.validator, true);
 		}
 
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfigurationTests.java

@@ -16,10 +16,15 @@
 
 package org.springframework.boot.autoconfigure.websocket;
 
+import java.net.URL;
+
 import javax.websocket.server.ServerContainer;
 
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
@@ -29,6 +34,7 @@ import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletConta
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -53,6 +59,14 @@ public class WebSocketAutoConfigurationTests {
 		}
 	}
 
+	@BeforeClass
+	@AfterClass
+	public static void uninstallUrlStreamHandlerFactory() {
+		ReflectionTestUtils.setField(TomcatURLStreamHandlerFactory.class, "instance",
+				null);
+		ReflectionTestUtils.setField(URL.class, "factory", null);
+	}
+
 	@Test
 	public void tomcatServerContainerIsAvailableFromTheServletContext() {
 		serverContainerIsAvailableFromTheServletContext(TomcatConfiguration.class,

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/Dependency.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -2048,7 +2048,7 @@ your application defines, if any.
 NOTE: By default, batch applications require a `DataSource` to store job details. If you
 want to deviate from that, you'll need to implement `BatchConfigurer`, see
 {spring-batch-javadoc}/core/configuration/annotation/EnableBatchProcessing.html[The
-Javadoc of @EnableBatchProcessing] for more details.
+Javadoc of `@EnableBatchProcessing`] for more details.
 
 
 

spring-boot-docs/src/main/java/org/springframework/boot/cloudfoundry/CloudFoundryIgnorePathsExample.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
@@ -24,7 +25,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-cache</artifactId>
 		</dependency>
-		<!-- Only used to expose cache metrics  -->
+		<!-- Only used to expose cache metrics -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

spring-boot-samples/spring-boot-sample-devtools/src/test/java/sample/devtools/SampleDevToolsApplicationIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestWebDriverCustomScopeIntegrationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,7 +120,8 @@ class MockDefinition extends Definition {
 		MockDefinition other = (MockDefinition) obj;
 		boolean result = super.equals(obj);
 		result = result && ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock);
-		result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces);
+		result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces,
+				other.extraInterfaces);
 		result = result && ObjectUtils.nullSafeEquals(this.answer, other.answer);
 		result = result && this.serializable == other.serializable;
 		return result;

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoApi.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito25Tests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyDefinitionTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JSONOrderedObject.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonConverter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshaller.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/TestJsonConverter.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java

@@ -278,12 +278,19 @@ class ProjectLibraries implements Libraries {
 
 	}
 
+	/**
+	 * Strategy used to resolve configurations regardless of the underlying Gradle
+	 * version.
+	 */
 	private interface TargetConfigurationResolver {
 
 		Configuration resolveTargetConfiguration(ProjectDependency projectDependency);
 
 	}
 
+	/**
+	 * {@link TargetConfigurationResolver} for Gradle 2.x.
+	 */
 	private static final class Gradle2TargetConfigurationResolver
 			implements TargetConfigurationResolver {
 
@@ -295,6 +302,9 @@ class ProjectLibraries implements Libraries {
 
 	}
 
+	/**
+	 * {@link TargetConfigurationResolver} for Gradle 3.x.
+	 */
 	private static final class Gradle3TargetConfigurationResolver
 			implements TargetConfigurationResolver {
 

spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.