小调整。

easyj-projects · May 21, 2024 · 9e75e7e · 9e75e7e
1 parent 35e7303
commit 9e75e7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...en-plugin/src/main/java/icu/easyj/maven/plugin/mojo/simplify/AbstractSimplifyPomMojo.java b/...en-plugin/src/main/java/icu/easyj/maven/plugin/mojo/simplify/AbstractSimplifyPomMojo.java
@@ -85,11 +85,13 @@ protected void writePom(Model model, File pomFile) throws MojoExecutionException
 		}
 
 		// 去除 '\r'
-		pomFileString = pomFileString.replace("\r", "");
+		pomFileString = pomFileString.replaceAll("\r", "");
 //		// 不同的maven版本，换行数量有些微不同，将多个连续的换行替换成单个换行
 //		pomFileString = pomFileString.replaceAll("\n{2,}", IOUtils.LINE_SEPARATOR);
 		// 去除多余的空格
-		pomFileString = pomFileString.replace(" />", "/>");
+		pomFileString = pomFileString.replaceAll(" />", "/>");
+		// 移除不必要的换行
+		pomFileString = pomFileString.replaceAll("\n{2,}<project ", "\n<project ");
 
 		// Write String to POM file
 		this.writeStringToFile(pomFileString, pomFile, model.getModelEncoding());

diff --git a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/MavenXpp3Writer.java b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/MavenXpp3Writer.java
@@ -488,9 +488,10 @@ private void writeMailingList(MailingList mailingList, MXSerializer serializer)
 
 	private void writeModel(MXSerializer serializer) throws IOException {
 		if (this.fileComment != null) {
-			serializer.comment(this.fileComment);
 			serializer.text(IOUtils.LINE_SEPARATOR);
+			serializer.comment(this.fileComment);
 		}
+		serializer.text(IOUtils.LINE_SEPARATOR);
 
 		//serializer.setPrefix("", "http://maven.apache.org/POM/4.0.0");
 		//serializer.setPrefix("xsi", "http://www.w3.org/2001/XMLSchema-instance");