root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4703 from thorntonrp/patch-1 

* pr/4703:
  Cleanup description new-lines for launch script
This commit is contained in:
Phillip Webb 2015-12-11 14:01:07 +00:00
parent a3a320d97b 8e0b8750c0
commit dc3ead4c39
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View File

@ -261,11 +261,16 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
putIfMissing(properties, "initInfoProvides", this.project.getArtifactId()); putIfMissing(properties, "initInfoProvides", this.project.getArtifactId());
putIfMissing(properties, "initInfoShortDescription", this.project.getName(), putIfMissing(properties, "initInfoShortDescription", this.project.getName(),
this.project.getArtifactId()); this.project.getArtifactId());
putIfMissing(properties, "initInfoDescription", this.project.getDescription(), putIfMissing(properties, "initInfoDescription",
this.project.getName(), this.project.getArtifactId()); removeLineBreaks(this.project.getDescription()), this.project.getName(),
this.project.getArtifactId());
return properties; return properties;
} }
private String removeLineBreaks(String description) {
return description.replaceAll("\\s+", " ");
}
private void putIfMissing(Properties properties, String key, private void putIfMissing(Properties properties, String key,
String... valueCandidates) { String... valueCandidates) {
if (!properties.containsKey(key)) { if (!properties.containsKey(key)) {