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/05/15 10:37:14 UTC
[maven-site-plugin] branch remove-default-skin updated: Last fix
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/remove-default-skin by this push:
new edeaf211 Last fix
edeaf211 is described below
commit edeaf2119d6b9a8e77e829e2e04b994b3d33935f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 15 12:37:05 2022 +0200
Last fix
---
src/it/projects/site-inheritance/verify.bsh | 40 ++++++++++++++---------------
src/it/projects/site-jar/verify.bsh | 2 +-
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/it/projects/site-inheritance/verify.bsh b/src/it/projects/site-inheritance/verify.bsh
index 04d0a996..68ac2f44 100644
--- a/src/it/projects/site-inheritance/verify.bsh
+++ b/src/it/projects/site-inheritance/verify.bsh
@@ -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!" );
@@ -237,7 +237,7 @@ try
}
content = FileUtils.fileRead( index, "UTF-8" );
- int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
+ int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\"><span class=\"none\"></span>Aggregator</a>" );
if ( indexOf < 0 )
{
System.err.println( "staged junk index.html is missing module link!" );
@@ -253,9 +253,9 @@ 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 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 index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\"><span class=\"none\"></span>Child and Module</a>" );
+ int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\"><span class=\"none\"></span>Inheriting Child</a>" );
+ int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\"><span class=\"none\"></span>Module</a>" );
int index4 = content.indexOf( "<a href=\"./\" title=\"Aggregator\">Aggregator</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -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!" );
@@ -414,7 +414,7 @@ try
}
content = FileUtils.fileRead( index, "UTF-8" );
- int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
+ int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\"><span class=\"none\"></span>Aggregator</a>" );
if ( indexOf < 0 )
{
System.err.println( "stage-deployed junk index.html is missing module link!" );
@@ -430,9 +430,9 @@ 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 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 index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\"><span class=\"none\"></span>Child and Module</a>" );
+ int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\"><span class=\"none\"></span>Inheriting Child</a>" );
+ int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\"><span class=\"none\"></span>Module</a>" );
int index4 = content.indexOf( "<a href=\"./\" title=\"Aggregator\">Aggregator</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
@@ -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/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();