From b3e6a07e2d25966ee94c5e380f3d937c4711c737 Mon Sep 17 00:00:00 2001
From: wangym <wangyuming11725@gmail.com>
Date: Wed, 6 Sep 2023 15:56:07 +0800
Subject: [PATCH] =?UTF-8?q?--taskid=3DID20230906=20=E5=85=B1=E7=94=A8?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=9A=84verion=E7=89=88=E6=9C=AC=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=EF=BC=8C=E6=94=BE=E5=9C=A8=E4=BB=BB=E5=8A=A1=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=E5=A4=84=E7=90=86=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=A4=9A=E4=B8=AA=E4=BE=9D=E8=B5=96=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=8D=E5=AE=8C=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/impl/MavenDependencyVersionReplaceJob.java   | 12 ++++++++++--
 src/test/resources/pom.xml                           |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java b/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
index baf1aae..c65b3f3 100644
--- a/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
+++ b/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
@@ -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();
@@ -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() {
@@ -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;
                 }
diff --git a/src/test/resources/pom.xml b/src/test/resources/pom.xml
index 30b49a1..ea85e29 100644
--- a/src/test/resources/pom.xml
+++ b/src/test/resources/pom.xml
@@ -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>