incorporated POMModelUtils methods

Signed-off-by: Achal Talati <achal.talati@oracle.com>
apache · Mar 15, 2024 · 556d4b4 · 556d4b4
1 parent f181020
commit 556d4b4
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/java/maven.hints/src/org/netbeans/modules/maven/hints/pom/ParentVersionError.java b/java/maven.hints/src/org/netbeans/modules/maven/hints/pom/ParentVersionError.java
@@ -108,12 +108,12 @@ public List<ErrorDescription> getErrorsForDocument(POMModel model, Project prj)
                     if (parentPrj != null) {
                         NbMavenProject nbprj = parentPrj.getLookup().lookup(NbMavenProject.class);
                         if (nbprj != null) { //do we have some non-maven project maybe?
-                            MavenProject mav = nbprj.getMavenProject();
-                            if(declaredVersion.startsWith("${") && declaredVersion.endsWith("}")){
-                                String key = declaredVersion.substring(2, declaredVersion.length()-1);
-                                Properties props = model.getProject().getProperties();
-                                if(props != null && props.getProperties().containsKey(key)){
-                                    declaredVersion = props.getProperties().get(key);
+                            MavenProject mav = nbprj.getMavenProject();  
+                            if(PomModelUtils.isPropertyExpression(declaredVersion)){
+                                String key = PomModelUtils.getPropertyName(declaredVersion);
+                                String propVal = PomModelUtils.getProperty(model, declaredVersion);
+                                if(propVal != null){
+                                    declaredVersion = propVal;
                                 }
                                 else {
                                     declaredVersion = mav.getProperties().getProperty(key, declaredVersion);