Merge branch '1.5.x' into 2.0.x

2018-07-13 09:25:42 +02:00
parent ed609f6395 e556c04d83
commit 174cc2bc4e
4 changed files with 72 additions and 0 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
@@ -142,6 +142,7 @@ class TypeUtils {
 		String javadoc = (element != null
 				? this.env.getElementUtils().getDocComment(element) : null);
 		if (javadoc != null) {
+			javadoc = javadoc.replaceAll("\\n", "");
 			javadoc = javadoc.trim();
 		}
 		return ("".equals(javadoc) ? null : javadoc);