[MNG-7897] Support ${project.rootDirectory} in file profile activation

gnodet · gnodet · commit ee440d153c2b · 2024-08-28T20:44:26.000+01:00
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java
@@ -81,7 +81,7 @@ public Object getValue(String expression) {
         interpolator.addValueSource(new AbstractValueSource(false) {
             @Override
             public Object getValue(String expression) {
-                if ("rootDirectory".equals(expression)) {
+                if ("project.rootDirectory".equals(expression)) {
                     Path root = rootLocator.findMandatoryRoot(basedir);
                     return root.toFile().getAbsolutePath();
                 }
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java
@@ -82,7 +82,7 @@ public Object getValue(String expression) {
         interpolator.addValueSource(new AbstractValueSource(false) {
             @Override
             public Object getValue(String expression) {
-                if ("rootDirectory".equals(expression)) {
+                if ("project.rootDirectory".equals(expression)) {
                     Path base = basedir != null ? basedir.toPath() : null;
                     Path root = rootLocator.findMandatoryRoot(base);
                     return root.toFile().getAbsolutePath();

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public Object getValue(String expression) {`
`81`	`81`	`interpolator.addValueSource(new AbstractValueSource(false) {`
`82`	`82`	`@Override`
`83`	`83`	`public Object getValue(String expression) {`
`84`		`- if ("rootDirectory".equals(expression)) {`
	`84`	`+ if ("project.rootDirectory".equals(expression)) {`
`85`	`85`	`Path root = rootLocator.findMandatoryRoot(basedir);`
`86`	`86`	`return root.toFile().getAbsolutePath();`
`87`	`87`	`}`