optimize: 优化 PomSimplifier，避免 dependencyManagement 中的版本号被替换为具体版本号，导致子…

…模块无法重写。
easyj-projects · Jun 13, 2024 · 88ce398 · 88ce398
1 parent c0d6ec6
commit 88ce398
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
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
@@ -666,7 +666,8 @@ protected void optimizeDependencies(List<Dependency> dependencies) {
 	}
 
 	protected Function<String, String> getReplaceVariableFunction() {
-		if (this.originalModel.getParent() != null || isEmpty(this.model.getProperties())) {
+		boolean removedParent = this.originalModel.getParent() == null && this.model.getParent() != null;
+		if (!removedParent && (this.originalModel.getParent() != null || isEmpty(this.model.getProperties()))) {
 			this.log.info(" - Optimize with 'getProjectProperty'");
 			return this::getProjectProperty;
 		} else {

diff --git a/...n/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/pom/DependenciesPomSimplifier.java b/...n/java/icu/easyj/maven/plugin/mojo/simplify/simplifier/pom/DependenciesPomSimplifier.java
@@ -57,13 +57,4 @@ public void doSimplify() {
 
 		super.doSimplify();
 	}
-
-
-	@Override
-	public void afterSimplify() {
-		this.replaceParentRevision();
-		this.removeGroupIdAndVersionIfEqualsToParent();
-		this.optimizeDependencyManagement();
-		this.optimizeDependencies();
-	}
 }
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
@@ -46,15 +46,6 @@ public void doSimplify() {
 	}
 
 
-	@Override
-	public void afterSimplify() {
-		this.replaceParentRevision();
-		this.removeGroupIdAndVersionIfEqualsToParent();
-		//this.optimizeDependencyManagement();
-		this.optimizeDependencies();
-	}
-
-
 	@Override
 	public void removeDependencyManagement() {
 		// do nothing