Merge branch '1.5.x'

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

@@ -110,7 +110,7 @@ public class LoggersMvcEndpointTests {
 	}
 
 	@Test
-	public void getLoggesWhenDisabledShouldReturnNotFound() throws Exception {
+	public void getLoggersRootWhenDisabledShouldReturnNotFound() throws Exception {
 		this.context.getBean(LoggersEndpoint.class).setEnabled(false);
 		this.mvc.perform(get("/loggers/ROOT")).andExpect(status().isNotFound());
 	}

spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm

@@ -33,7 +33,7 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>com.example</groupid>
+            <groupId>com.example</groupId>
             <artifactId>custom-layout</artifactId>
             <version>0.0.1.BUILD-SNAPSHOT</version>
           </dependency>

spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -68,7 +68,7 @@ public enum DatabaseDriver {
 	/**
 	 * Maria DB.
 	 */
-	MARIADB("maridb", "MySQL", "org.mariadb.jdbc.Driver",
+	MARIADB("mariadb", "MySQL", "org.mariadb.jdbc.Driver",
 			"org.mariadb.jdbc.MariaDbDataSource", "SELECT 1"),
 
 	/**