Merge branch '1.5.x'

Author: snicoll

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

@@ -116,7 +116,7 @@ private enum InMemoryDatabase {
 
 			H2("jdbc:h2:mem:", "org.h2.Driver", "org.h2.jdbcx.JdbcDataSource"),
 
-			HQSQLDB("jdbc:hsqldb:mem:", "org.hsqldb.jdbcDriver",
+			HSQLDB("jdbc:hsqldb:mem:", "org.hsqldb.jdbcDriver",
 					"org.hsqldb.jdbc.JDBCDriver",
 					"org.hsqldb.jdbc.pool.JDBCXADataSource");
 

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java

@@ -69,7 +69,7 @@ public void h2ServerIsNotShutdown() throws SQLException {
 	}
 
 	@Test
-	public void inMemoryh2IsShutdown() throws SQLException {
+	public void inMemoryH2IsShutdown() throws SQLException {
 		ConfigurableApplicationContext context = createContext("org.h2.Driver",
 				"jdbc:h2:mem:test", DataSourceAutoConfiguration.class,
 				DataSourceSpyConfiguration.class);

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -1156,7 +1156,7 @@ content into your application; rather pick only the properties that you need.
 	management.shell.ssh.idle-timeout = # Number of milliseconds after which unused connections are closed.
 	management.shell.ssh.key-path= # Path to the SSH server key.
 	management.shell.ssh.port=2000 # SSH port.
-	management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is  available.
+	management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available.
 	management.shell.telnet.port=5000 # Telnet port.
 
 	# TRACING ({sc-spring-boot-actuator}/trace/TraceProperties.{sc-ext}[TraceProperties])

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

@@ -6170,7 +6170,7 @@ might not actually appear on the running application classpath. You can also use
 
 [TIP]
 ====
-If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as apart of a
+If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as a part of a
 meta-annotation to compose your own composed annotations you must use `name` as referring
 to the class in such a case is not handled.
 ====

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java

@@ -33,7 +33,7 @@ class DataMongoTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter
 
 	private final DataMongoTest annotation;
 
-	DataMongoTypeExcludeFilter(final Class<?> testClass) {
+	DataMongoTypeExcludeFilter(Class<?> testClass) {
 		this.annotation = AnnotatedElementUtils.getMergedAnnotation(testClass,
 				DataMongoTest.class);
 	}