bugfix: 修复 simplify-pom 插件生成 <profiles> 内容时，变量变为了实际值的问题修复。

easyj-projects · May 21, 2024 · c9bd9e9 · c9bd9e9
1 parent 7886ba8
commit c9bd9e9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java
@@ -133,7 +133,7 @@ public void execute() throws MojoExecutionException {
 			getLog().info("fileList: " + generateFiles.toString());
 
 			for (FileInfo fileInfo : generateFiles) {
-				if (StringUtils.isEmpty(fileInfo.getPath()) || fileInfo.isEnabled()) {
+				if (StringUtils.isEmpty(fileInfo.getPath()) || !fileInfo.isEnabled()) {
 					continue;
 				}
 

diff --git a/.../src/main/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/AbstractPomSimplifier.java b/.../src/main/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/AbstractPomSimplifier.java
@@ -857,17 +857,6 @@ public void removeProfiles() {
 		}
 	}
 
-	public void keepProfiles() {
-		if (isEmpty(originalModel.getProfiles())) {
-			return;
-		}
-
-		if ((originalModel.getParent() != null && model.getParent() != null)
-				|| (originalModel.getParent() == null && model.getParent() == null)) {
-			originalModel.setProfiles(model.getProfiles());
-		}
-	}
-
 	//endregion ##
 
 

diff --git a/...ugin/src/main/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/pom/PomSimplifier.java b/...ugin/src/main/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/pom/PomSimplifier.java
@@ -43,8 +43,6 @@ public void doSimplify() {
 		this.removeModules();
 
 		this.removeLocalProperties();
-
-		this.keepProfiles();
 	}
 
 

diff --git a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java
@@ -122,7 +122,7 @@ public static void createFile(File newFile, String text) throws IOException {
 		}
 
 		try (FileOutputStream out = new FileOutputStream(newFile)) {
-			out.write(text.getBytes());
+			out.write(text.replaceAll("\r", "").getBytes());
 			out.flush();
 		}
 	}