Skip to content

Commit

Permalink
--taskid=ID20230906
Browse files Browse the repository at this point in the history
共用引用的verion版本声明,放在任务最后删除处理,避免多个依赖导致替换不完全
  • Loading branch information
xinluke committed Sep 6, 2023
1 parent d3bd9ae commit b3e6a07
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class ModelWrapper {
// 白名单列表
private List<String> standardList = Arrays.asList("java.version",
"project.version");
private List<String> unusedVersionKey = new ArrayList<>();

public ModelWrapper(DependencyVersionService dvService, Model model) {
super();
Expand Down Expand Up @@ -105,6 +106,13 @@ public void process() {
deleteDuplicateDependencies(dm.getDependencies());
}
mergeProperty();

doAfter();
}

private void doAfter() {
//因为是不标准的版本属性声明,需要显式指定进行删除
unusedVersionKey.forEach(it -> model.getProperties().remove(it));
}

private List<Dependency> getDependencyOfDependencyManagement() {
Expand Down Expand Up @@ -135,8 +143,8 @@ private void processDependency(Dependency d){
String realVer;
if (version.contains("$")) {
realVer = getRefVersionValue(d);
//因为是不标准的版本属性声明,需要显式指定进行删除
model.getProperties().remove(getRefVersionKey(version));
//可能会有对个依赖引用了同一个属性,得放在最后处理
unusedVersionKey.add(getRefVersionKey(version));
} else {
realVer = version;
}
Expand Down
6 changes: 6 additions & 0 deletions src/test/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--使用默认的内置变量-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit b3e6a07

Please sign in to comment.