Merge branch '1.5.x'

spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring

@@ -8,6 +8,10 @@ case "`uname`" in
 		cygwin=true
 		;;
 
+	MINGW*)
+		cygwin=true
+		;;
+
 	Darwin*)
 		darwin=true
 		;;

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

@@ -192,7 +192,6 @@ class TypeUtils {
 			if (type.getTypeArguments().isEmpty()) {
 				return qualifiedName;
 			}
-			else {
 			StringBuilder name = new StringBuilder();
 			name.append(qualifiedName);
 			name.append("<").append(type.getTypeArguments().stream()
@@ -200,7 +199,6 @@ class TypeUtils {
 					.append(">");
 			return name.toString();
 		}
-		}
 
 		@Override
 		public String visitArray(ArrayType t, Void none) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.