You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/06 10:46:31 UTC

[maven-doxia-sitetools] branch master updated: [DOXIASITETOOLS-234] improve doc site.xml inheritence vs interpolation

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git


The following commit(s) were added to refs/heads/master by this push:
     new eccba71  [DOXIASITETOOLS-234] improve doc site.xml inheritence vs interpolation
eccba71 is described below

commit eccba710e039df756fca982732e2a1e56a41f6b4
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Nov 6 11:46:29 2021 +0100

    [DOXIASITETOOLS-234] improve doc site.xml inheritence vs interpolation
---
 doxia-decoration-model/src/site/apt/index.apt  | 3 +++
 doxia-integration-tools/src/site/apt/index.apt | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doxia-decoration-model/src/site/apt/index.apt b/doxia-decoration-model/src/site/apt/index.apt
index 9cec49b..66a1f4d 100644
--- a/doxia-decoration-model/src/site/apt/index.apt
+++ b/doxia-decoration-model/src/site/apt/index.apt
@@ -46,3 +46,6 @@ Doxia Sitetool Decoration Model
  with its <<<DefaultDecorationModelInheritanceAssembler>>> implementation
  ({{{./xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html}source}}).
 
+* Interpolation
+
+ Interpolation is not done here: see {{{../doxia-integration-tools/} Doxia Integration Tools}} documentation for more details.
diff --git a/doxia-integration-tools/src/site/apt/index.apt b/doxia-integration-tools/src/site/apt/index.apt
index ff336c2..88b394f 100644
--- a/doxia-integration-tools/src/site/apt/index.apt
+++ b/doxia-integration-tools/src/site/apt/index.apt
@@ -51,8 +51,8 @@ Maven Doxia Integration Tools
   * with <<late>> interpolation, replacement happens <<after>> inheritance. This is the classical behaviour in Maven pom,
 
   * with <<early>> interpolation, replacement happens <<before>> inheritance: this was the default behaviour for <<<project.*>>>
-  values until Doxia Sitetools 1.7, when these early and late interpolation definitions didn't exist.
-  Since Doxia Sitetools 1.7.1, early interpolation happens for <<<this.*>>> values.
+  values until Doxia Sitetools 1.7 (used in {{{/plugins/maven-site-plugin/history.html} Maven Site Plugin 3.5}}), when these early and late interpolation definitions didn't exist.
+  Since Doxia Sitetools 1.7.1 (used in {{{/plugins/maven-site-plugin/history.html} Maven Site Plugin 3.5.1}}), early interpolation happens for <<<this.*>>> values.
 
   []