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

Cleanup description new-lines for launch script 

Replace all new-line characters in multi-line pom descriptions before
inserting into the launcher script. Prior to this commit the shell would
attempt to execut the extra lines, for example:

	<description>
		A multi-line pom description that could do something terrible:
		rm -r foo
	</description>

Closes gh-4703
This commit is contained in:
Robert Thornton 2015-12-07 17:15:10 -07:00 committed by Phillip Webb
parent a3a320d97b
commit 8e0b8750c0
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)) {