Author: hboutemy
Date: Sun Jan 17 23:42:57 2016
New Revision: 1725152
URL: http://svn.apache.org/viewvc?rev=1725152&view=rev
Log:
[MSITE-135] interpolation is done after inheritance, with child values (through
DOXIASITETOOLS-118)
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy?rev=1725152&r1=1725151&r2=1725152&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
Sun Jan 17 23:42:57 2016
@@ -36,12 +36,8 @@ assert content.contains( '<<<http://mave
// Site Decoration Model inheritance+interpolation
childContent = new File( basedir, 'child/target/site/index.html' ).text;
-// see DOXIASITETOOLS-118: interpolation happens too early
-// assert childContent.contains( 'project.artifactId = child' );
-assert childContent.contains( 'project.artifactId = repo-parent' );
+assert childContent.contains( 'project.artifactId = child' );
reactorContent = new File( basedir, 'reactor-parent/target/site/index.html'
).text;
-// see DOXIASITETOOLS-118: interpolation happens too early
-// assert reactorContent.contains( 'project.artifactId = reactor-parent' );
-assert reactorContent.contains( 'project.artifactId = repo-parent' );
+assert reactorContent.contains( 'project.artifactId = reactor-parent' );