[MNG-8402] System properties can take precedence over builtin expressions

compat/maven-embedder/pom.xml

@@ -176,7 +176,6 @@ under the License.
     <dependency>
       <groupId>com.google.jimfs</groupId>
       <artifactId>jimfs</artifactId>
-      <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

impl/maven-cli/pom.xml

@@ -92,7 +92,6 @@ under the License.
     <dependency>
       <groupId>com.google.jimfs</groupId>
       <artifactId>jimfs</artifactId>
-      <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

impl/maven-impl/pom.xml

@@ -164,6 +164,11 @@ under the License.
       <artifactId>maven-resolver-transport-apache</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.jimfs</groupId>
+      <artifactId>jimfs</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java

@@ -184,8 +184,12 @@ String doCallback(
                 }
             }
         }
+        // un-prefixed model reflection
+        String value = projectProperty(model, projectDir, expression, false);
         // user properties
-        String value = request.getUserProperties().get(expression);
+        if (value == null) {
+            value = request.getUserProperties().get(expression);
+        }
         // model properties
         if (value == null) {
             value = model.getProperties().get(expression);
@@ -198,11 +202,7 @@ String doCallback(
         if (value == null) {
             value = request.getSystemProperties().get("env." + expression);
         }
-        if (value != null) {
-            return value;
-        }
-        // model reflection
-        return projectProperty(model, projectDir, expression, false);
+        return value;
     }
 
     String projectProperty(Model model, Path projectDir, String subExpr, boolean prefixed) {
@@ -223,7 +223,7 @@ String projectProperty(Model model, Path projectDir, String subExpr, boolean pre
             } else if (prefixed && subExpr.startsWith("baseUri.")) {
                 try {
                     Object value = ReflectionValueExtractor.evaluate(
-                            subExpr, projectDir.toAbsolutePath().toUri(), false);
+                            subExpr, projectDir.toAbsolutePath().toUri(), true);
                     if (value != null) {
                         return value.toString();
                     }
@@ -234,8 +234,8 @@ String projectProperty(Model model, Path projectDir, String subExpr, boolean pre
                 return rootLocator.findMandatoryRoot(projectDir).toString();
             } else if (prefixed && subExpr.startsWith("rootDirectory.")) {
                 try {
-                    Object value = ReflectionValueExtractor.evaluate(
-                            subExpr, projectDir.toAbsolutePath().toUri(), false);
+                    Object value =
+                            ReflectionValueExtractor.evaluate(subExpr, rootLocator.findMandatoryRoot(projectDir), true);
                     if (value != null) {
                         return value.toString();
                     }