Merge branch '1.5.x'

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java

@@ -83,7 +83,6 @@ public class AuditEventTests {
 				Collections.singletonMap("type", (Object) "BadCredentials"));
 		String json = Jackson2ObjectMapperBuilder.json().build()
 				.writeValueAsString(event);
-		System.out.println(json);
 		JSONObject jsonObject = new JSONObject(json);
 		assertThat(jsonObject.getString("type")).isEqualTo("UNKNOWN");
 		assertThat(jsonObject.getJSONObject("data").getString("type"))

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java

@@ -196,10 +196,10 @@ class OnClassCondition extends SpringBootCondition
 		}
 	}
 
-	private List<String> getMatches(Collection<String> candiates, MatchType matchType,
+	private List<String> getMatches(Collection<String> candidates, MatchType matchType,
 			ClassLoader classLoader) {
-		List<String> matches = new ArrayList<String>(candiates.size());
-		for (String candidate : candiates) {
+		List<String> matches = new ArrayList<String>(candidates.size());
+		for (String candidate : candidates) {
 			if (matchType.matches(candidate, classLoader)) {
 				matches.add(candidate);
 			}

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

@@ -2184,7 +2184,7 @@ application starts for testing. If you want to be more sophisticated you can use
 profile-specific configuration to customize `flyway.locations` so that certain migrations
 will only run when a particular profile is active. For example, in
 `application-dev.properties` you could set `flyway.locations` to
-`classpath:/db/migration, claspath:/dev/db/migration` and migrations in `dev/db/migration`
+`classpath:/db/migration, classpath:/dev/db/migration` and migrations in `dev/db/migration`
 will only run when the `dev` profile is active.
 
 

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

@@ -1579,7 +1579,7 @@ it's loaded too early. You need to either use `logback-spring.xml` or define a
 WARNING: The extensions cannot be used with Logback's
 http://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
 attempt to do so, making changes to the configuration file will result in an error similar
-to once of the following being logged:
+to one of the following being logged:
 
 ----
 ERROR in ch.qos.logback.core.joran.spi.Interpreter@4:71 - no applicable action for [springProperty], current ElementPath is [[configuration][springProperty]]

spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java

@@ -108,7 +108,7 @@ public class AutoConfigureAnnotationProcessorTests {
 	}
 
 	private Properties compile(Class<?>... types) throws IOException {
-		TestConditionMetdataAnnotationProcessor processor = new TestConditionMetdataAnnotationProcessor(
+		TestConditionMetadataAnnotationProcessor processor = new TestConditionMetadataAnnotationProcessor(
 				this.compiler.getOutputLocation());
 		this.compiler.getTask(types).call(processor);
 		return processor.getWrittenProperties();

spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestConditionMetdataAnnotationProcessor.java → spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestConditionMetadataAnnotationProcessor.java

@@ -35,12 +35,12 @@ import javax.annotation.processing.SupportedAnnotationTypes;
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureBefore",
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureAfter",
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureOrder" })
-public class TestConditionMetdataAnnotationProcessor
+public class TestConditionMetadataAnnotationProcessor
 		extends AutoConfigureAnnotationProcessor {
 
 	private final File outputLocation;
 
-	public TestConditionMetdataAnnotationProcessor(File outputLocation) {
+	public TestConditionMetadataAnnotationProcessor(File outputLocation) {
 		this.outputLocation = outputLocation;
 	}
 

spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java

@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigureprocessor;
 import java.io.OutputStream;
 
 /**
- * Test configuration with an annoated method.
+ * Test configuration with an annotated method.
  *
  * @author Madhura Bhave
  */