Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java

@@ -164,7 +164,8 @@ public class OAuth2AuthorizationServerConfiguration
 			String prefix = "security.oauth2.client";
 			boolean defaultSecret = this.credentials.isDefaultSecret();
 			logger.info(String.format(
-					"Initialized OAuth2 Client%n%n%s.clientId = %s%n%s.secret = %s%n%n",
+					"Initialized OAuth2 Client%n%n%s.client-id = %s%n"
+							+ "%s.client-secret = %s%n%n",
 					prefix, this.credentials.getClientId(), prefix,
 					defaultSecret ? this.credentials.getClientSecret() : "****"));
 		}