Skip to content

S
spring-boot
Commit dc3ead4c authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge pull request #4703 from thorntonrp/patch-1 

* pr/4703:
  Cleanup description new-lines for launch script
parents a3a320d9 8e0b8750
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View file @ dc3ead4c
...@@ -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, "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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment