From a74893f24636dbf6afd5fb1025c37be77c752ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Fri, 28 Mar 2014 08:20:13 +0100
Subject: [PATCH] improved documentation: ${basedir} for profile activation is
 Maven 3 only

---
 .../model/profile/activation/FileProfileActivator.java      | 3 ++-
 maven-model-builder/src/site/apt/index.apt                  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index ae20762b22..2c4eb278c0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -39,7 +39,8 @@
 
 /**
  * Determines profile activation based on the existence/absence of some file.
- * File name interpolation support is limited to <code>${basedir}</code>,
+ * File name interpolation support is limited to <code>${basedir}</code> (since Maven 3,
+ * see <a href="http://jira.codehaus.org/browse/MNG-2363">MNG-2363</a>),
  * System properties and request properties.
  * <code>${project.basedir}</code> is intentionally not supported as this form would suggest that other
  * <code>${project.*}</code> expressions can be used, which is however beyond the design.
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index 69aa8a422e..e660b6245b 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -41,7 +41,7 @@ Maven Model Builder
 
    ** profile activation: see {{{./apidocs/org/apache/maven/model/profile/activation/package-summary.html}available activators}}.
    Notice that model interpolation hasn't happened yet, then interpolation for file-based activation is limited to
-   <<<$\{basedir}>>>, System properties and request properties
+   <<<$\{basedir}>>> (since Maven 3), System properties and request properties
 
    ** model normalization: <<<ModelNormalizer>>> ({{{./apidocs/org/apache/maven/model/normalization/ModelNormalizer.html}javadoc}}),
    with its <<<DefaultModelNormalizer>>> implementation
@@ -99,8 +99,8 @@ Maven Model Builder
   {{{./xref/org/apache/maven/model/interpolation/StringSearchModelInterpolator.html}source}}).
 
   Notice that model interpolation happens <after> profile activation, then profile activation doesn't benefit from every values:
-  interpolation for file-based activation is limited to <<<$\{basedir}>>> (which is not deprecated in this context),
-  System properties and request properties.
+  interpolation for file-based activation is limited to <<<$\{basedir}>>> (which was introduced in Maven 3 and is not deprecated
+  in this context), System properties and request properties.
 
   Values are evaluated in sequence from different syntaxes: