You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/06/19 10:20:18 UTC
[maven-site-plugin] branch MSITE-900 updated (ed10f397 -> 5af28d7a)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSITE-900
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
discard ed10f397 [MSITE-900] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
new 5af28d7a [MSITE-900] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ed10f397)
\
N -- N -- N refs/heads/MSITE-900 (5af28d7a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/it/projects/inheritance-interpolation/verify.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-site-plugin] 01/01: [MSITE-900] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-900
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 5af28d7aaaaf33830aa4ec2477f733c6404b5d51
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 15 23:09:35 2022 +0200
[MSITE-900] Upgrade to Doxia/Doxia Sitetools to 2.0.0-M3
This closes #85
---
pom.xml | 5 +-
src/it/projects/MSITE-159/pom.xml | 4 ++
src/it/projects/MSITE-159/src/site/site.xml | 5 ++
src/it/projects/MSITE-159/verify.bsh | 2 +-
src/it/projects/MSITE-265/pom.xml | 1 +
src/it/projects/MSITE-265/src/site/site.xml | 4 +-
src/it/projects/MSITE-265/verify.bsh | 4 +-
src/it/projects/MSITE-458/pom.xml | 1 +
src/it/projects/MSITE-458/src/site/site.xml | 5 ++
src/it/projects/MSITE-497/pom.xml | 4 ++
src/it/projects/MSITE-497/src/site/site.xml | 5 ++
src/it/projects/MSITE-566/pom.xml | 1 +
src/it/projects/MSITE-566/src/site/site.xml | 5 ++
src/it/projects/MSITE-566/verify.bsh | 2 +-
src/it/projects/MSITE-582/child/src/site/site.xml | 5 ++
src/it/projects/MSITE-582/pom.xml | 4 ++
src/it/projects/MSITE-582/src/site/site.xml | 5 ++
src/it/projects/MSITE-609/pom.xml | 1 +
src/it/projects/MSITE-609/src/site/site.xml | 4 +-
src/it/projects/MSITE-658/pom.xml | 1 +
src/it/projects/MSITE-658/src/site/site.xml | 6 +++
src/it/projects/MSITE-658/src/site/site_de.xml | 6 +++
src/it/projects/MSITE-658/verify.bsh | 4 +-
src/it/projects/MSITE-856/pom.xml | 4 ++
src/it/projects/MSITE-856/src/site/site.xml | 6 +++
src/it/projects/doxia-formats/pom.xml | 8 +--
.../src/site/apt/velocity-context.apt.vm | 2 +-
src/it/projects/doxia-formats/src/site/site.xml | 2 +-
.../doxia-formats/src/site/xhtml/xhtml-macro.xhtml | 10 ++--
.../doxia-formats/src/site/xhtml/xhtml.xhtml | 2 +-
src/it/projects/effective-site/pom.xml | 4 ++
src/it/projects/effective-site/src/site/site.xml | 5 ++
src/it/projects/inheritance-interpolation/pom.xml | 4 ++
.../inheritance-interpolation/repo-parent/pom.xml | 1 +
.../repo-parent/src/site/site.xml | 6 +++
.../inheritance-interpolation/verify.groovy | 2 +-
src/it/projects/inheritedMenus/parentAsRef/pom.xml | 4 ++
.../inheritedMenus/parentAsRef/src/site/site.xml | 5 ++
.../grandChildNotAsRef/src/site/site.xml | 5 ++
.../parentNotAsRef/childNotAsRef/src/site/site.xml | 5 ++
.../projects/inheritedMenus/parentNotAsRef/pom.xml | 4 ++
.../parentNotAsRef/src/site/site.xml | 5 ++
src/it/projects/inheritedMenus/verify.bsh | 60 +++++++++++-----------
.../site-attach-descriptor/child/src/site/site.xml | 5 ++
src/it/projects/site-attach-descriptor/pom.xml | 1 +
.../site-attach-descriptor/src/site/site.xml | 4 +-
.../site-attach-descriptor/src/site/site_sv.xml | 4 +-
src/it/projects/site-deploy/pom.xml | 1 +
src/it/projects/site-deploy/src/site/site.xml | 4 +-
.../child_and_module/src/site/site.xml | 6 +++
.../inheriting_child/src/site/site.xml | 6 +++
src/it/projects/site-inheritance/module/pom.xml | 8 +--
.../site-inheritance/module/src/site/site.xml | 6 +++
src/it/projects/site-inheritance/parent/pom.xml | 4 ++
.../site-inheritance/parent/src/site/site.xml | 6 +++
src/it/projects/site-inheritance/pom.xml | 4 ++
.../site-inheritance/sub_module/src/site/site.xml | 6 +++
src/it/projects/site-inheritance/verify.bsh | 26 +++++-----
src/it/projects/site-jar/pom.xml | 1 +
src/it/projects/site-jar/src/site/site.xml | 4 +-
src/it/projects/site-jar/verify.bsh | 2 +-
.../site-sd-lang/mymodule/src/site/site.xml | 5 ++
.../site-sd-lang/mymodule/src/site/site_fr.xml | 5 ++
src/it/projects/site-sd-lang/pom.xml | 4 ++
src/it/projects/site-sd-lang/src/site/site.xml | 5 ++
src/it/projects/site-sd-lang/src/site/site_fr.xml | 6 +++
src/it/projects/site-sd/pom.xml | 4 ++
src/it/projects/site-sd/src/site/site.xml | 6 +++
src/it/projects/validate/pom.xml | 1 +
src/it/projects/validate/src/site/site.xml | 6 +++
src/site/apt/examples/creating-content.apt.vm | 14 ++---
src/site/apt/examples/creatingskins.apt | 6 +--
src/test/projects/site-plugin-test10/maven-site.vm | 48 ++++++++---------
.../unit/deploy-dav/target/site/index.html | 22 ++++----
74 files changed, 332 insertions(+), 126 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8117e7ce..c1eb742e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,8 +198,8 @@ under the License.
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<!-- for dependencies -->
- <doxiaVersion>2.0.0-M2</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M2</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M3</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M3-SNAPSHOT</doxiaSitetoolsVersion>
<jettyVersion>9.4.46.v20220331</jettyVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
@@ -212,6 +212,7 @@ under the License.
<surefirePluginVersion>2.22.2</surefirePluginVersion>
<mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
<mavenReportingImplVersion>4.0.0-M1</mavenReportingImplVersion>
+ <fluidoSkinVersion>1.11.0</fluidoSkinVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-04-27T21:14:43Z</project.build.outputTimestamp>
diff --git a/src/it/projects/MSITE-159/pom.xml b/src/it/projects/MSITE-159/pom.xml
index 731cf57f..b5772b5d 100644
--- a/src/it/projects/MSITE-159/pom.xml
+++ b/src/it/projects/MSITE-159/pom.xml
@@ -31,6 +31,10 @@ under the License.
<url>http://webhost.company.com/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/MSITE-159/src/site/site.xml b/src/it/projects/MSITE-159/src/site/site.xml
index c666a02d..e0d61b02 100644
--- a/src/it/projects/MSITE-159/src/site/site.xml
+++ b/src/it/projects/MSITE-159/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<links>
diff --git a/src/it/projects/MSITE-159/verify.bsh b/src/it/projects/MSITE-159/verify.bsh
index 8b9b875f..27ae87ed 100644
--- a/src/it/projects/MSITE-159/verify.bsh
+++ b/src/it/projects/MSITE-159/verify.bsh
@@ -43,7 +43,7 @@ try
String content = FileUtils.fileRead( index, "UTF-8" );
int index1 = content.indexOf( "<a href=\"http://webhost.company.com/index.html\" class=\"externalLink\" title=\"Breadcrumb\">Breadcrumb</a>" );
int index2 = content.indexOf( "<a href=\"http://webhost.company.com/\" class=\"externalLink\" title=\"Link\">Link</a>" );
- int index3 = content.indexOf( "<a href=\"http://webhost.company.com/\" class=\"externalLink\" title=\"Menu\">Menu</a>" );
+ int index3 = content.indexOf( "<a href=\"http://webhost.company.com/\" class=\"externalLink\" title=\"Menu\"><span class=\"none\"></span>Menu</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "index.html has incorrect links!" );
diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml
index 9b9a40e6..91f7063c 100644
--- a/src/it/projects/MSITE-265/pom.xml
+++ b/src/it/projects/MSITE-265/pom.xml
@@ -34,6 +34,7 @@ under the License.
<properties>
<currentVersion>3.0.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<build>
diff --git a/src/it/projects/MSITE-265/src/site/site.xml b/src/it/projects/MSITE-265/src/site/site.xml
index 2cfb4865..3db39072 100644
--- a/src/it/projects/MSITE-265/src/site/site.xml
+++ b/src/it/projects/MSITE-265/src/site/site.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/MSITE-265/verify.bsh b/src/it/projects/MSITE-265/verify.bsh
index e4603090..400667d8 100644
--- a/src/it/projects/MSITE-265/verify.bsh
+++ b/src/it/projects/MSITE-265/verify.bsh
@@ -71,9 +71,9 @@ try
System.err.println( "download.html doesn't contain Download Maven 3.0.5" );
return false;
}
- if ( downloadContent.indexOf( "charset=UTF-8" ) < 0 )
+ if ( downloadContent.indexOf( "charset=\"UTF-8\"" ) < 0 )
{
- System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" );
+ System.err.println( "download.html doesn't contain 'charset=\"UTF-8\"' directive" );
return false;
}
if ( downloadContent.indexOf( "demo character: € (euro)" ) < 0 )
diff --git a/src/it/projects/MSITE-458/pom.xml b/src/it/projects/MSITE-458/pom.xml
index e703aa48..43eb1293 100644
--- a/src/it/projects/MSITE-458/pom.xml
+++ b/src/it/projects/MSITE-458/pom.xml
@@ -31,6 +31,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<modules>
diff --git a/src/it/projects/MSITE-458/src/site/site.xml b/src/it/projects/MSITE-458/src/site/site.xml
index 1e4a3366..d901a162 100644
--- a/src/it/projects/MSITE-458/src/site/site.xml
+++ b/src/it/projects/MSITE-458/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<menu ref="modules"/>
</body>
diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml
index ff6dd1a5..84df2aeb 100644
--- a/src/it/projects/MSITE-497/pom.xml
+++ b/src/it/projects/MSITE-497/pom.xml
@@ -28,6 +28,10 @@ under the License.
<packaging>pom</packaging>
<name>parent</name>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<modules>
<module>apps</module>
</modules>
diff --git a/src/it/projects/MSITE-497/src/site/site.xml b/src/it/projects/MSITE-497/src/site/site.xml
index c8e55cd5..50b563bc 100644
--- a/src/it/projects/MSITE-497/src/site/site.xml
+++ b/src/it/projects/MSITE-497/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
diff --git a/src/it/projects/MSITE-566/pom.xml b/src/it/projects/MSITE-566/pom.xml
index 93fc629d..d8763fca 100644
--- a/src/it/projects/MSITE-566/pom.xml
+++ b/src/it/projects/MSITE-566/pom.xml
@@ -32,6 +32,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<menu.title>Documentation</menu.title>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<build>
diff --git a/src/it/projects/MSITE-566/src/site/site.xml b/src/it/projects/MSITE-566/src/site/site.xml
index 0e4d7710..694ea926 100644
--- a/src/it/projects/MSITE-566/src/site/site.xml
+++ b/src/it/projects/MSITE-566/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<menu name="${menu.title}">
<item name="Home" href="index.html"/>
diff --git a/src/it/projects/MSITE-566/verify.bsh b/src/it/projects/MSITE-566/verify.bsh
index 0c978aea..94c81a59 100644
--- a/src/it/projects/MSITE-566/verify.bsh
+++ b/src/it/projects/MSITE-566/verify.bsh
@@ -66,7 +66,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "MSITE-566 IT" );
- index2 = content.indexOf( "<h5>Documentation</h5>" );
+ index2 = content.indexOf( "<li class=\"nav-header\">Documentation</li>" );
if ( index1 < 0 || index2 < 0 )
{
System.err.println( "generated site has unresolved properties!" );
diff --git a/src/it/projects/MSITE-582/child/src/site/site.xml b/src/it/projects/MSITE-582/child/src/site/site.xml
index 532d9529..6dfcf6a8 100644
--- a/src/it/projects/MSITE-582/child/src/site/site.xml
+++ b/src/it/projects/MSITE-582/child/src/site/site.xml
@@ -22,6 +22,11 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<breadcrumbs>
<item name="C" href="A/B/C"/>
diff --git a/src/it/projects/MSITE-582/pom.xml b/src/it/projects/MSITE-582/pom.xml
index f8f10b3c..bb472de4 100644
--- a/src/it/projects/MSITE-582/pom.xml
+++ b/src/it/projects/MSITE-582/pom.xml
@@ -31,6 +31,10 @@ under the License.
<description>Make it possible to remove breadcrumbs in child projects again</description>
<url>http://www.example.com/parent/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<modules>
<module>child</module>
</modules>
diff --git a/src/it/projects/MSITE-582/src/site/site.xml b/src/it/projects/MSITE-582/src/site/site.xml
index c8533502..d8b9ccfb 100644
--- a/src/it/projects/MSITE-582/src/site/site.xml
+++ b/src/it/projects/MSITE-582/src/site/site.xml
@@ -22,6 +22,11 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<breadcrumbs>
<item name="A" href="A"/>
diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-609/pom.xml
index 5b5925aa..7e17f40f 100644
--- a/src/it/projects/MSITE-609/pom.xml
+++ b/src/it/projects/MSITE-609/pom.xml
@@ -34,6 +34,7 @@ under the License.
<properties>
<currentVersion>@mavenVersion@</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<distributionManagement>
diff --git a/src/it/projects/MSITE-609/src/site/site.xml b/src/it/projects/MSITE-609/src/site/site.xml
index 2cfb4865..3db39072 100644
--- a/src/it/projects/MSITE-609/src/site/site.xml
+++ b/src/it/projects/MSITE-609/src/site/site.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/MSITE-658/pom.xml b/src/it/projects/MSITE-658/pom.xml
index cab60004..c90545b7 100644
--- a/src/it/projects/MSITE-658/pom.xml
+++ b/src/it/projects/MSITE-658/pom.xml
@@ -42,6 +42,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<build>
diff --git a/src/it/projects/MSITE-658/src/site/site.xml b/src/it/projects/MSITE-658/src/site/site.xml
index 42feaf95..415fc2ca 100644
--- a/src/it/projects/MSITE-658/src/site/site.xml
+++ b/src/it/projects/MSITE-658/src/site/site.xml
@@ -22,6 +22,12 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<menu name="Main" inherit="top">
<item name="Home" href="http://maven.apache.org/sub-directory/index.html"/>
diff --git a/src/it/projects/MSITE-658/src/site/site_de.xml b/src/it/projects/MSITE-658/src/site/site_de.xml
index f257dd4b..83498f62 100644
--- a/src/it/projects/MSITE-658/src/site/site_de.xml
+++ b/src/it/projects/MSITE-658/src/site/site_de.xml
@@ -22,6 +22,12 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<menu name="Main" inherit="top">
<item name="Heim" href="http://maven.apache.org/sub-directory/de/index.html"/>
diff --git a/src/it/projects/MSITE-658/verify.bsh b/src/it/projects/MSITE-658/verify.bsh
index 2d423a31..557af2f4 100644
--- a/src/it/projects/MSITE-658/verify.bsh
+++ b/src/it/projects/MSITE-658/verify.bsh
@@ -41,7 +41,7 @@ try
}
String content = FileUtils.fileRead( licenses, "UTF-8" );
- int index = content.indexOf( "<a href=\"index.html\" title=\"Home\">Home</a>" );
+ int index = content.indexOf( "<a href=\"index.html\" title=\"Home\"><span class=\"none\"></span>Home</a>" );
if ( index < 0 )
{
System.err.println( "licenses.html has incorrect links!" );
@@ -65,7 +65,7 @@ try
}
content = FileUtils.fileRead( licenses, "UTF-8" );
- int index = content.indexOf( "<a href=\"index.html\" title=\"Heim\">Heim</a>" );
+ int index = content.indexOf( "<a href=\"index.html\" title=\"Heim\"><span class=\"none\"></span>Heim</a>" );
if ( index < 0 )
{
System.err.println( "licenses.html has incorrect links!" );
diff --git a/src/it/projects/MSITE-856/pom.xml b/src/it/projects/MSITE-856/pom.xml
index ddd787e6..de20b4d6 100644
--- a/src/it/projects/MSITE-856/pom.xml
+++ b/src/it/projects/MSITE-856/pom.xml
@@ -29,6 +29,10 @@ under the License.
<packaging>pom</packaging>
<name>MSITE-856</name>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MSITE-856/src/site/site.xml b/src/it/projects/MSITE-856/src/site/site.xml
index 88a1a957..b563671d 100644
--- a/src/it/projects/MSITE-856/src/site/site.xml
+++ b/src/it/projects/MSITE-856/src/site/site.xml
@@ -22,6 +22,12 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<menu name="My Menu">
<item name="My first item"/>
diff --git a/src/it/projects/doxia-formats/pom.xml b/src/it/projects/doxia-formats/pom.xml
index 2acd9ee0..5ce94926 100644
--- a/src/it/projects/doxia-formats/pom.xml
+++ b/src/it/projects/doxia-formats/pom.xml
@@ -31,13 +31,15 @@ under the License.
<properties>
<property-project-version>@project.version@</property-project-version>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>3.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
index b1e30996..5ae7936b 100644
--- a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
+++ b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
@@ -90,7 +90,7 @@ Doxia Site Renderer Velocity Context
| <<<project>>> | = <<<$project>>>, \
| | <<<project.version>>> = <<<$project.version>>>
*-----------------------+-------------------------------------------------------+
-| <<<property-project-version>>> | = <<<${property-project-version}>>>
+| <<<property-project-version>>> | = <<<$context.get('property-project-version')>>>
*-----------------------+-------------------------------------------------------+
| (attributes) <<<att1>>> | = <<<${att1}>>>
*-----------------------+-------------------------------------------------------+
diff --git a/src/it/projects/doxia-formats/src/site/site.xml b/src/it/projects/doxia-formats/src/site/site.xml
index d8acbe27..89ceaab9 100644
--- a/src/it/projects/doxia-formats/src/site/site.xml
+++ b/src/it/projects/doxia-formats/src/site/site.xml
@@ -25,7 +25,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.8</version>
+ <version>${fluidoSkinVersion}</version>
</skin>
<custom>
diff --git a/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml b/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
index 48c8480c..b6da8c5d 100644
--- a/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
+++ b/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -29,17 +29,17 @@ under the License.
<body>
-<h2>Macros in XHTML</h2>
+<h1>Macros in XHTML</h1>
-<h3>TOC Macro</h3>
+<h2>TOC Macro</h2>
<!-- MACRO{toc} -->
-<h3>Echo Macro</h3>
+<h2>Echo Macro</h2>
<!-- MACRO{echo|param1=value1|param2=value2} -->
-<h3>Snippet Macro</h3>
+<h2>Snippet Macro</h2>
<!-- MACRO{snippet|id=macros|file=src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java} -->
diff --git a/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml b/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml
index c2c0131c..b0d84ab3 100644
--- a/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml
+++ b/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/it/projects/effective-site/pom.xml b/src/it/projects/effective-site/pom.xml
index f9a91686..27685e1f 100644
--- a/src/it/projects/effective-site/pom.xml
+++ b/src/it/projects/effective-site/pom.xml
@@ -37,6 +37,10 @@ under the License.
<name>site:effective-site IT</name>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/projects/effective-site/src/site/site.xml b/src/it/projects/effective-site/src/site/site.xml
index d15d3e56..2864e628 100644
--- a/src/it/projects/effective-site/src/site/site.xml
+++ b/src/it/projects/effective-site/src/site/site.xml
@@ -22,6 +22,11 @@ under the License.
<project name="MSITE-680" xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<menu name="Welcome">
diff --git a/src/it/projects/inheritance-interpolation/pom.xml b/src/it/projects/inheritance-interpolation/pom.xml
index 8ad5f6c9..6323a6b6 100644
--- a/src/it/projects/inheritance-interpolation/pom.xml
+++ b/src/it/projects/inheritance-interpolation/pom.xml
@@ -35,6 +35,10 @@ under the License.
repo-parent is expected to be only available in repo (installed before execution)
</description>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<modules>
<module>reactor-parent</module>
<module>child</module>
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
index 7494a6c8..3382e357 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -41,6 +41,7 @@ under the License.
<distUrl>scp://from.repo/dist</distUrl>
<msite604.siteRepositoryId>repo-parent-id</msite604.siteRepositoryId>
<msite604.siteRepositoryBase>default-repository-base-from-repo-parent</msite604.siteRepositoryBase>
+ <fluidoSkinVersion>1.11.0</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
</properties>
<distributionManagement>
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml b/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
index 403ea481..12db5cb5 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
@@ -26,6 +26,12 @@ under the License.
<name>project.artifactId = ${project.artifactId}</name>
</bannerLeft>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<breadcrumbs>
<item name="Maven" href="http://maven.apache.org/index.html" />
diff --git a/src/it/projects/inheritance-interpolation/verify.groovy b/src/it/projects/inheritance-interpolation/verify.groovy
index 340c5c8c..928b2d37 100644
--- a/src/it/projects/inheritance-interpolation/verify.groovy
+++ b/src/it/projects/inheritance-interpolation/verify.groovy
@@ -36,7 +36,7 @@ assert content.contains( '<<<http://maven.apache.org/prop-value-from-child/relat
// Site Decoration Model inheritance+interpolation
childContent = new File( basedir, 'child/target/site/index.html' ).text;
-assert childContent.contains( 'project.artifactId = child' );
+assert childContent.contains( '<div id="bannerLeft">child' );
// breadcrumbs
assert childContent.contains( '<a href="../../index.html"' );
diff --git a/src/it/projects/inheritedMenus/parentAsRef/pom.xml b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
index a8bc396f..993d8b0a 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
@@ -30,6 +30,10 @@ under the License.
<name>Parent As Ref</name>
<url>http://example.com/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml b/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
index caa52732..2f6d87d9 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="Parent As Ref Site">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
index a7f0afce..fb1612fa 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="Grand Child Not As Ref Site">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
index 5a4bb6b2..d3ef8cc0 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="Child Not As Ref Site">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
index 56f23e29..69e400c1 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
@@ -30,6 +30,10 @@ under the License.
<name>Parent Not As Ref</name>
<url>http://example.com/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml b/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
index 0007fb58..b6ffe062 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="Parent Not As Ref Site">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
diff --git a/src/it/projects/inheritedMenus/verify.bsh b/src/it/projects/inheritedMenus/verify.bsh
index c4494500..d92d798b 100644
--- a/src/it/projects/inheritedMenus/verify.bsh
+++ b/src/it/projects/inheritedMenus/verify.bsh
@@ -47,10 +47,10 @@ try
}
String content = FileUtils.fileRead( parentIndex, "UTF-8" );
- int index1 = content.indexOf( "<strong>Parent Relative Home Inherited</strong>" );
- int index2 = content.indexOf( "<strong>Parent Relative Home Inherited with dot</strong>" );
- int index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
- int index4 = content.indexOf( "<strong>Parent Absolute Home Inherited with index</strong>" );
+ int index1 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Relative Home Inherited</a></li>" );
+ int index2 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Relative Home Inherited with dot</a></li>" );
+ int index3 = content.indexOf( "<li><a href=\"./\" title=\"Parent Absolute Home Inherited\"><span class=\"none\"></span>Parent Absolute Home Inherited</a></li>" );
+ int index4 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Absolute Home Inherited with index</a></li>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -58,10 +58,10 @@ try
result = false;
}
- index1 = content.indexOf( "<strong>Parent Relative Home Local</strong>" );
- index2 = content.indexOf( "<strong>Parent Relative Home Local with dot</strong>" );
- index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home Local\">Parent Absolute Home Local</a>" );
- index4 = content.indexOf( "<strong>Parent Absolute Home Local with index</strong>" );
+ index1 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Relative Home Local</a></li>" );
+ index2 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Relative Home Local with dot</a></li>" );
+ index3 = content.indexOf( "<li><a href=\"./\" title=\"Parent Absolute Home Local\"><span class=\"none\"></span>Parent Absolute Home Local</a></li>" );
+ index4 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Parent Absolute Home Local with index</a></li>" );
if ( index1 < 0 || index2 < 0 || index4 < 0 )
{
@@ -69,9 +69,9 @@ try
result = false;
}
- index1 = content.indexOf( "<a href=\"childNotAsRef/index.html\" title=\"Child Not As Ref\">Child Not As Ref</a>" );
- index2 = content.indexOf( "<a href=\"project-info.html\" title=\"Project Information\">Project Information</a>" );
- index3 = content.indexOf( "<h5>Parent Project</h5>" );
+ index1 = content.indexOf( "<li><a href=\"childNotAsRef/index.html\" title=\"Child Not As Ref\"><span class=\"none\"></span>Child Not As Ref</a></li>" );
+ index2 = content.indexOf( "<li><a href=\"project-info.html\" title=\"Project Information\"><span class=\"icon-chevron-down\"></span>Project Information</a" );
+ index3 = content.indexOf( "<li class=\"nav-header\">Parent Project</li>" );
if ( index1 < 0 || index2 < 0 || index3 >= 0 )
{
@@ -105,10 +105,10 @@ try
}
content = FileUtils.fileRead( childIndex, "UTF-8" );
- index1 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
- index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
- index3 = content.indexOf( "<a href=\"../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
- index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Absolute Home Inherited with index\">Parent Absolute Home Inherited with index</a>" );
+ index1 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited\"><span class=\"none\"></span>Parent Relative Home Inherited</a>" );
+ index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited with dot\"><span class=\"none\"></span>Parent Relative Home Inherited with dot</a>" );
+ index3 = content.indexOf( "<a href=\"../\" title=\"Parent Absolute Home Inherited\"><span class=\"none\"></span>Parent Absolute Home Inherited</a>" );
+ index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Absolute Home Inherited with index\"><span class=\"none\"></span>Parent Absolute Home Inherited with index</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -116,10 +116,10 @@ try
result = false;
}
- index1 = content.indexOf( "<strong>Child Relative Home Local</strong>" );
- index2 = content.indexOf( "<strong>Child Relative Home Local with dot</strong>" );
- index3 = content.indexOf( "<a href=\"./\" title=\"Child Absolute Home Local\">Child Absolute Home Local</a>" );
- index4 = content.indexOf( "<strong>Child Absolute Home Local with index</strong>" );
+ index1 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Child Relative Home Local</a></li>" );
+ index2 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Child Relative Home Local with dot</a></li>" );
+ index3 = content.indexOf( "<li><a href=\"./\" title=\"Child Absolute Home Local\"><span class=\"none\"></span>Child Absolute Home Local</a></li>" );
+ index4 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Child Absolute Home Local with index</a></li>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -127,8 +127,8 @@ try
result = false;
}
- index1 = content.indexOf( "<a href=\"grandChildNotAsRef/index.html\" title=\"GrandChild Not As Ref\">GrandChild Not As Ref</a>" );
- index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Not As Ref\">Parent Not As Ref</a>" );
+ index1 = content.indexOf( "<a href=\"grandChildNotAsRef/index.html\" title=\"GrandChild Not As Ref\"><span class=\"none\"></span>GrandChild Not As Ref</a>" );
+ index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Not As Ref\"><span class=\"none\"></span>Parent Not As Ref</a>" );
if ( index1 < 0 || index2 < 0 )
{
@@ -162,10 +162,10 @@ try
}
content = FileUtils.fileRead( grandChildIndex, "UTF-8" );
- index1 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
- index2 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
- index3 = content.indexOf( "<a href=\"../../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
- index4 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Absolute Home Inherited with index\">Parent Absolute Home Inherited with index</a>" );
+ index1 = content.indexOf( "a href=\"../../index.html\" title=\"Parent Relative Home Inherited\"><span class=\"none\"></span>Parent Relative Home Inherited</a>" );
+ index2 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited with dot\"><span class=\"none\"></span>Parent Relative Home Inherited with dot</a>" );
+ index3 = content.indexOf( "<a href=\"../../\" title=\"Parent Absolute Home Inherited\"><span class=\"none\"></span>Parent Absolute Home Inherited</a>" );
+ index4 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Absolute Home Inherited with index\"><span class=\"none\"></span>Parent Absolute Home Inherited with index</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -173,10 +173,10 @@ try
result = false;
}
- index1 = content.indexOf( "<strong>Grand Child Relative Home Local</strong>" );
- index2 = content.indexOf( "<strong>Grand Child Relative Home Local with dot</strong>" );
- index3 = content.indexOf( "<a href=\"./\" title=\"Grand Child Absolute Home Local\">Grand Child Absolute Home Local</a>" );
- index4 = content.indexOf( "<strong>Grand Child Absolute Home Local with index</strong>" );
+ index1 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Grand Child Relative Home Local</a></li>" );
+ index2 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Grand Child Relative Home Local with dot</a></li>" );
+ index3 = content.indexOf( "<li><a href=\"./\" title=\"Grand Child Absolute Home Local\"><span class=\"none\"></span>Grand Child Absolute Home Local</a></li>" );
+ index4 = content.indexOf( "<li class=\"active\"><a><span class=\"none\"></span>Grand Child Absolute Home Local with index</a></li>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -184,7 +184,7 @@ try
result = false;
}
- index1 = content.indexOf( "<a href=\"../index.html\" title=\"Child Not As Ref\">Child Not As Ref</a>" );
+ index1 = content.indexOf( "<a href=\"../index.html\" title=\"Child Not As Ref\"><span class=\"none\"></span>Child Not As Ref</a>" );
if ( index1 < 0 )
{
diff --git a/src/it/projects/site-attach-descriptor/child/src/site/site.xml b/src/it/projects/site-attach-descriptor/child/src/site/site.xml
index 9e7b8b8b..ffc055e3 100644
--- a/src/it/projects/site-attach-descriptor/child/src/site/site.xml
+++ b/src/it/projects/site-attach-descriptor/child/src/site/site.xml
@@ -22,4 +22,9 @@ under the License.
<project name="MSITE-597" xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
</project>
diff --git a/src/it/projects/site-attach-descriptor/pom.xml b/src/it/projects/site-attach-descriptor/pom.xml
index ddb935cf..845879a0 100644
--- a/src/it/projects/site-attach-descriptor/pom.xml
+++ b/src/it/projects/site-attach-descriptor/pom.xml
@@ -39,6 +39,7 @@ under the License.
<properties>
<currentVersion>@mavenVersion@</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<distributionManagement>
diff --git a/src/it/projects/site-attach-descriptor/src/site/site.xml b/src/it/projects/site-attach-descriptor/src/site/site.xml
index 2cfb4865..3db39072 100644
--- a/src/it/projects/site-attach-descriptor/src/site/site.xml
+++ b/src/it/projects/site-attach-descriptor/src/site/site.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/site-attach-descriptor/src/site/site_sv.xml b/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
index ceb8269e..3d95df02 100644
--- a/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
+++ b/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/site-deploy/pom.xml b/src/it/projects/site-deploy/pom.xml
index 296816b7..6beb9ec1 100644
--- a/src/it/projects/site-deploy/pom.xml
+++ b/src/it/projects/site-deploy/pom.xml
@@ -34,6 +34,7 @@ under the License.
<properties>
<currentVersion>@mavenVersion@</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<distributionManagement>
diff --git a/src/it/projects/site-deploy/src/site/site.xml b/src/it/projects/site-deploy/src/site/site.xml
index 2cfb4865..3db39072 100644
--- a/src/it/projects/site-deploy/src/site/site.xml
+++ b/src/it/projects/site-deploy/src/site/site.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/site-inheritance/child_and_module/src/site/site.xml b/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
index f0862cce..bae7aae1 100644
--- a/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
@@ -21,6 +21,12 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
diff --git a/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml b/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
index f0862cce..bae7aae1 100644
--- a/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
+++ b/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
@@ -21,6 +21,12 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
diff --git a/src/it/projects/site-inheritance/module/pom.xml b/src/it/projects/site-inheritance/module/pom.xml
index 431ea1da..de67f808 100644
--- a/src/it/projects/site-inheritance/module/pom.xml
+++ b/src/it/projects/site-inheritance/module/pom.xml
@@ -30,6 +30,11 @@ under the License.
<name>Module</name>
<url>http://webhost.company.com/www/website/module</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
@@ -70,7 +75,4 @@ under the License.
<module>../sub_module</module>
</modules>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
diff --git a/src/it/projects/site-inheritance/module/src/site/site.xml b/src/it/projects/site-inheritance/module/src/site/site.xml
index d0986336..4da7d4ee 100644
--- a/src/it/projects/site-inheritance/module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/module/src/site/site.xml
@@ -21,6 +21,12 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
diff --git a/src/it/projects/site-inheritance/parent/pom.xml b/src/it/projects/site-inheritance/parent/pom.xml
index f62ccdab..0a6a8134 100644
--- a/src/it/projects/site-inheritance/parent/pom.xml
+++ b/src/it/projects/site-inheritance/parent/pom.xml
@@ -30,6 +30,10 @@ under the License.
<name>Parent</name>
<url>http://webhost.company.com/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/site-inheritance/parent/src/site/site.xml b/src/it/projects/site-inheritance/parent/src/site/site.xml
index 35c2e891..c8259287 100644
--- a/src/it/projects/site-inheritance/parent/src/site/site.xml
+++ b/src/it/projects/site-inheritance/parent/src/site/site.xml
@@ -21,6 +21,12 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
diff --git a/src/it/projects/site-inheritance/pom.xml b/src/it/projects/site-inheritance/pom.xml
index ccfa82b3..f01b8c67 100644
--- a/src/it/projects/site-inheritance/pom.xml
+++ b/src/it/projects/site-inheritance/pom.xml
@@ -30,6 +30,10 @@ under the License.
<name>Top</name>
<url>http://webhost.company.com/junk/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/site-inheritance/sub_module/src/site/site.xml b/src/it/projects/site-inheritance/sub_module/src/site/site.xml
index 31b3d42e..ef633014 100644
--- a/src/it/projects/site-inheritance/sub_module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/sub_module/src/site/site.xml
@@ -21,6 +21,12 @@ under the License.
<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
diff --git a/src/it/projects/site-inheritance/verify.bsh b/src/it/projects/site-inheritance/verify.bsh
index 34ddd995..4483b87e 100644
--- a/src/it/projects/site-inheritance/verify.bsh
+++ b/src/it/projects/site-inheritance/verify.bsh
@@ -75,7 +75,7 @@ try
}
content = FileUtils.fileRead( index, "UTF-8" );
- int index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\">Child and Module</a>" );
+ int index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\">Child and Module</a></li>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\">Module</a>" );
int index4 = content.indexOf( "<a href=\"./\" title=\"Aggregator\">Aggregator</a>" );
@@ -119,7 +119,7 @@ try
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
- index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "deployed deepDownBelow index.html is missing links!" );
@@ -145,7 +145,7 @@ try
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
- index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "deployed inheritingChild index.html is missing links!" );
@@ -170,7 +170,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
- index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
+ index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\"><span class=\"none\"></span>Sub-Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "deployed moduleDirectory index.html has wrong links!" );
@@ -197,7 +197,7 @@ try
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
- index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\">Module</a>" );
+ index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\"><span class=\"none\"></span>Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "deployed subModuleDirectory index.html has wrong links!" );
@@ -297,7 +297,7 @@ try
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
- index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "staged deepDownBelow index.html is missing links!" );
@@ -323,7 +323,7 @@ try
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
- index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "staged inheritingChild index.html is missing links!" );
@@ -348,7 +348,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
- index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
+ index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\"><span class=\"none\"></span>Sub-Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "staged moduleDirectory index.html has wrong links!" );
@@ -375,7 +375,7 @@ try
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
- index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\">Module</a>" );
+ index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\"><span class=\"none\"></span>Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "staged subModuleDirectory index.html has wrong links!" );
@@ -474,7 +474,7 @@ try
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
- index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "stage-deployed deepDownBelow index.html is missing links!" );
@@ -500,7 +500,7 @@ try
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
- index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\">Parent</a>" );
+ index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent\"><span class=\"none\"></span>Parent</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "stage-deployed inheritingChild index.html is missing links!" );
@@ -525,7 +525,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
- index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
+ index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\"><span class=\"none\"></span>Sub-Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "stage-deployed moduleDirectory index.html has wrong links!" );
@@ -552,7 +552,7 @@ try
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
- index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\">Module</a>" );
+ index4 = content.indexOf( "<a href=\"../module/index.html\" title=\"Module\"><span class=\"none\"></span>Module</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 )
{
System.err.println( "stage-deployed subModuleDirectory index.html has wrong links!" );
diff --git a/src/it/projects/site-jar/pom.xml b/src/it/projects/site-jar/pom.xml
index 4e149b1c..8e7b2845 100644
--- a/src/it/projects/site-jar/pom.xml
+++ b/src/it/projects/site-jar/pom.xml
@@ -35,6 +35,7 @@ under the License.
<currentVersion>@mavenVersion@</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2019-11-02T17:48:12Z</project.build.outputTimestamp>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<distributionManagement>
diff --git a/src/it/projects/site-jar/src/site/site.xml b/src/it/projects/site-jar/src/site/site.xml
index 2cfb4865..3db39072 100644
--- a/src/it/projects/site-jar/src/site/site.xml
+++ b/src/it/projects/site-jar/src/site/site.xml
@@ -26,8 +26,8 @@ under the License.
<version position="left"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.5</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
</skin>
<body>
<breadcrumbs>
diff --git a/src/it/projects/site-jar/verify.bsh b/src/it/projects/site-jar/verify.bsh
index 4e5a08b4..8a39c1f9 100644
--- a/src/it/projects/site-jar/verify.bsh
+++ b/src/it/projects/site-jar/verify.bsh
@@ -41,7 +41,7 @@ try
return false;
}
- String[] fileNames = new String[] { "images/h3.jpg", "download.html", "index.html", "releases/release1.6.html" };
+ String[] fileNames = new String[] { "download.html", "index.html", "releases/release1.6.html" };
Set contents = new HashSet();
diff --git a/src/it/projects/site-sd-lang/mymodule/src/site/site.xml b/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
index 620dadda..d72e7f3d 100644
--- a/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
+++ b/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="${project.name}">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<version position="left" />
<body>
<menu name="${project.name}">
diff --git a/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml b/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
index b266c141..1f17396f 100644
--- a/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
+++ b/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="${project.name}">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<version position="left" />
<body>
<menu name="${project.name}">
diff --git a/src/it/projects/site-sd-lang/pom.xml b/src/it/projects/site-sd-lang/pom.xml
index 7eb182a2..087c3f68 100755
--- a/src/it/projects/site-sd-lang/pom.xml
+++ b/src/it/projects/site-sd-lang/pom.xml
@@ -31,6 +31,10 @@ under the License.
<url>http://my.url.com/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>website</id>
diff --git a/src/it/projects/site-sd-lang/src/site/site.xml b/src/it/projects/site-sd-lang/src/site/site.xml
index 64c3a025..d8327fc5 100644
--- a/src/it/projects/site-sd-lang/src/site/site.xml
+++ b/src/it/projects/site-sd-lang/src/site/site.xml
@@ -20,6 +20,11 @@ under the License.
-->
<project name="${project.name}">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<version position="left" />
<body>
diff --git a/src/it/projects/site-sd-lang/src/site/site_fr.xml b/src/it/projects/site-sd-lang/src/site/site_fr.xml
index 64c3a025..e7233270 100644
--- a/src/it/projects/site-sd-lang/src/site/site_fr.xml
+++ b/src/it/projects/site-sd-lang/src/site/site_fr.xml
@@ -20,6 +20,12 @@ under the License.
-->
<project name="${project.name}">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<version position="left" />
<body>
diff --git a/src/it/projects/site-sd/pom.xml b/src/it/projects/site-sd/pom.xml
index a4cee47c..dfc17da2 100644
--- a/src/it/projects/site-sd/pom.xml
+++ b/src/it/projects/site-sd/pom.xml
@@ -31,6 +31,10 @@ under the License.
<description>Basic stage-deploy test</description>
<url>http://www.example.com/parent/</url>
+ <properties>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
+ </properties>
+
<distributionManagement>
<site>
<id>msite-304</id>
diff --git a/src/it/projects/site-sd/src/site/site.xml b/src/it/projects/site-sd/src/site/site.xml
index a881cc2b..6f427168 100644
--- a/src/it/projects/site-sd/src/site/site.xml
+++ b/src/it/projects/site-sd/src/site/site.xml
@@ -22,6 +22,12 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<menu ref="parent"/>
<menu ref="reports"/>
diff --git a/src/it/projects/validate/pom.xml b/src/it/projects/validate/pom.xml
index 3b42c892..2c82d7ae 100644
--- a/src/it/projects/validate/pom.xml
+++ b/src/it/projects/validate/pom.xml
@@ -32,6 +32,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<build>
diff --git a/src/it/projects/validate/src/site/site.xml b/src/it/projects/validate/src/site/site.xml
index 98f79a2e..14298caf 100644
--- a/src/it/projects/validate/src/site/site.xml
+++ b/src/it/projects/validate/src/site/site.xml
@@ -30,6 +30,12 @@ under the License.
<src>http://maven.apache.org/images/maven-small.gif</src>
</bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
diff --git a/src/site/apt/examples/creating-content.apt.vm b/src/site/apt/examples/creating-content.apt.vm
index 1d6111ad..52b93088 100644
--- a/src/site/apt/examples/creating-content.apt.vm
+++ b/src/site/apt/examples/creating-content.apt.vm
@@ -55,10 +55,7 @@ Creating Content
| +- other.xml
|
+- xhtml/
- | +- xhtml-too.xhtml
- |
- +- xhtml5/
- | +- xhtml5-content.xhtml5
+ | +- xhtml-content.xhtml
|
+- site.xml
--------------------
@@ -116,8 +113,7 @@ Creating Content
+- general.html
+- faq.html
+- other.html
- +- xhtml-too.html
- +- xhtml5-content.html
+ +- xhtml-content.html
--------------------
This means that <<</src/site/apt/index.apt>>> will be available in the site as
@@ -189,12 +185,12 @@ Creating Content
* <<Markdown conflict with Velocity on ${esc.h}${esc.h} syntax>>:
Since <<<${esc.h}${esc.h}>>> denotes a
- {{{http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments}single line comment}} in Velocity,
+ {{{https://velocity.apache.org/engine/2.3/vtl-reference.html#single-line-comments}single line comment}} in Velocity,
Markdown headers using this syntax are suppressed from generated content.
- You can use {{{http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content}unparsed content syntax}}
+ You can use {{{https://velocity.apache.org/engine/2.3/vtl-reference.html#unparsed-content}unparsed content syntax}}
<<<${esc.h}[[#[[##]]#]]${esc.h}>>> or
- {{{http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html}escape tool}}
+ {{{https://velocity.apache.org/tools/3.1/apidocs/org/apache/velocity/tools/generic/EscapeTool.html}escape tool}}
like <<<${esc.d}\{esc.h\}${esc.d}\{esc.h\}>>>.
* Internationalization
diff --git a/src/site/apt/examples/creatingskins.apt b/src/site/apt/examples/creatingskins.apt
index ffe8c7c5..72a7e74c 100644
--- a/src/site/apt/examples/creatingskins.apt
+++ b/src/site/apt/examples/creatingskins.apt
@@ -86,8 +86,8 @@ Creating Skins
modify it to your needs.
For more information about how to write Velocity templates see the
- {{{http://velocity.apache.org/engine/releases/velocity-1.7/user-guide.html}Velocity User Guide}}
+ {{{https://velocity.apache.org/engine/2.3/user-guide.html}Velocity User Guide}}
and
- {{{http://velocity.apache.org/engine/releases/velocity-1.7/vtl-reference-guide.html}Velocity Template Language Reference Guide}}.
+ {{{https://velocity.apache.org/engine/2.3/vtl-reference.html}Velocity Template Language Reference Guide}}.
- Notice that Velocity 1.7 is used since Maven Site Plugin 3.5, but version 1.5 was used previously.
+ Notice that Velocity 2.3 is used since Maven Site Plugin 4.0.0-M2, but version 1.7 was used previously.
diff --git a/src/test/projects/site-plugin-test10/maven-site.vm b/src/test/projects/site-plugin-test10/maven-site.vm
index acfa1a7d..896c77dd 100644
--- a/src/test/projects/site-plugin-test10/maven-site.vm
+++ b/src/test/projects/site-plugin-test10/maven-site.vm
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -146,44 +146,44 @@
#macro ( publishDate $position)
#if ( $siteDescriptor.getChild( "publishDate" ) )
-
- #if ( $siteDescriptor.getChild( "publishDate" ).getAttribute( "format" ) )
+
+ #if ( $siteDescriptor.getChild( "publishDate" ).getAttribute( "format" ) )
#set ( $format = $siteDescriptor.getChild( "publishDate" ).getAttribute( "format" ) )
#end
-
+
#if ( $format )
$dateFormat.applyPattern( $format )
#end
- ##$dateFormat.applyPattern( "MM/dd/yyyy" )
- ##end
-
+ ##$dateFormat.applyPattern( "MM/dd/yyyy" )
+ ##end
+
#set ( $dateToday = $dateFormat.format( $currentDate ) )
-
- #set ( $datePosition = $siteDescriptor.getChild( "publishDate" ).getAttribute( "position" ) )
+
+ #set ( $datePosition = $siteDescriptor.getChild( "publishDate" ).getAttribute( "position" ) )
#if ( $datePosition.equalsIgnoreCase( $position ) )
-
+
#if ( $datePosition.equalsIgnoreCase( "right" ) || $datePosition.equalsIgnoreCase( "bottom" ) )
| $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday
-
+
#elseif ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) || $datePosition.equalsIgnoreCase( "navigation-top" ) )
<div id="lastPublished">$i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday</div>
-
+
#elseif ( $datePosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday | Doc for
+ $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday | Doc for
#if ( $siteDescriptor.getChild( "version" ))
$siteDescriptor.getChild( "version" ).getValue()
#else
${project.version}
#end
</div>
- #end
+ #end
#end
- #end
+ #end
#end
#macro ( poweredByLogo )
-
+
#if( $siteDescriptor.getChild( "powered-by" ) )
#foreach ($item in $siteDescriptor.getChild( "powered-by" ).getChildren() )
#if( $item.getAttribute( "href" ) )
@@ -191,20 +191,20 @@
#else
#set ( $href="http://maven.apache.org/" )
#end
-
+
#if( $item.getAttribute( "name" ) )
#set ( $name = $item.getAttribute( "name" ) )
#else
#set ( $name = $i18n.getString( "site-plugin", $locale, "template.builtby" ) )
#set ( $name = "${name} Maven" )
- #end
-
+ #end
+
#if( $item.getAttribute( "img" ) )
#set ( $img = $item.getAttribute( "img" ) )
#else
#set ( $img = "maven-feather.png" )
- #end
-
+ #end
+
<a href="$href" title="$name" id="poweredBy">
<img alt="$name" src="$relativePath/images/logos/$img"></img>
</a>
@@ -222,7 +222,7 @@
#end
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<html>
<head>
<title>$title</title>
@@ -261,7 +261,7 @@
</div>
<div id="leftColumn">
<div id="navcolumn">
- #publishDate( "navigation-top" )
+ #publishDate( "navigation-top" )
#mainMenu()
#poweredByLogo()
#publishDate( "navigation-bottom" )
diff --git a/src/test/resources/unit/deploy-dav/target/site/index.html b/src/test/resources/unit/deploy-dav/target/site/index.html
index f42bdc41..c3f387ab 100644
--- a/src/test/resources/unit/deploy-dav/target/site/index.html
+++ b/src/test/resources/unit/deploy-dav/target/site/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<!-- Generated by Apache Maven Doxia at Aug 7, 2010 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>Maven -
+ <title>Maven -
Welcome to Apache Maven</title>
<style type="text/css" media="all">
@import url("./css/maven-base.css");
@@ -14,9 +14,9 @@
<meta name="author" content="Jason van Zyl" />
<meta name="Date-Revision-yyyymmdd" content="20100807" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-
+
<script type="text/javascript">_uacct = "UA-140879-1";
urchinTracker();</script>
</head>
@@ -33,13 +33,13 @@
</div>
</div>
<div id="breadcrumbs">
-
+
<div class="xleft">
<a href="http://www.apache.org/" class="externalLink">Apache</a>
>
Maven
</div>
- <div class="xright">
+ <div class="xright">
Last Published: 2010-08-07
</div>
<div class="clear">
@@ -48,7 +48,7 @@
</div>
<div id="leftColumn">
<div id="navcolumn">
-
+
<h5>Main</h5>
<ul>
<li class="none">
@@ -199,7 +199,7 @@
<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
<img alt="Built by Maven" src="./images/logos/maven-feather.png"/>
</a>
-
+
</div>
</div>
<div id="bodyColumn">
@@ -220,7 +220,7 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License. -->
-
+
<!-- TODO: news? -->
<div class="section"><h2></h2> <!-- valid xdoc needs at least a section -->
@@ -422,7 +422,7 @@ under the License. -->
foundation, see the <a class="externalLink" href="http://www.apache.org/foundation/sponsorship.html">sponsorship</a> page.
</p>
</div></div>
-
+
</div>
</div>
@@ -432,7 +432,7 @@ under the License. -->
<div id="footer">
<div class="xright">© 2002-2010
The Apache Software Foundation
-
+
- <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a></div>
<div class="clear">
<hr/>