Browse Source

Merge pull request #4703 from thorntonrp/patch-1

* pr/4703:
  Cleanup description new-lines for launch script
pull/4674/merge
Phillip Webb 10 years ago
parent
commit
dc3ead4c39
  1. 9
      spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

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

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

Loading…
Cancel
Save