Bump maven-site-plugin to v3.20.0 (#297)

abelsromero · web-flow · commit 661d1bf2b76f · 2024-11-02T17:02:30.000+01:00
* Removed now invalid 'relativizeDecorationLinks' configuration
* Updated sources location to new 'locales' in converter-example
* Update other dependencies:
  * maven-fluido-skin v2.0.2-M11
  * maven-project-info-reports-plugin v3.7.0
* Update tests to new generated HTML
diff --git a/asciidoc-maven-site-converter-example/pom.xml b/asciidoc-maven-site-converter-example/pom.xml
@@ -23,13 +23,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.20.0</version>
                 <configuration>
                     <!-- Disable generateReports if you don't want to include the built-in reports -->
                     <generateReports>true</generateReports>
                     <generateSitemap>true</generateSitemap>
-                    <relativizeDecorationLinks>false</relativizeDecorationLinks>
-                    <locales>en</locales>
                     <inputEncoding>UTF-8</inputEncoding>
                     <outputEncoding>UTF-8</outputEncoding>
                     <!-- Ignore files prefixed with underscore -->
diff --git a/asciidoc-maven-site-converter-example/src/site/site.xml b/asciidoc-maven-site-converter-example/src/site/site.xml
@@ -1,4 +1,6 @@
-<project>
+<site xmlns="http://maven.apache.org/SITE/2.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
     <body>
         <menu ref="reports" inherit="top"/>
         <menu ref="modules"/>
@@ -10,6 +12,6 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.12.0</version>
+        <version>2.0.0-M11</version>
     </skin>
-</project>
+</site>
diff --git a/asciidoc-maven-site-parser-example/pom.xml b/asciidoc-maven-site-parser-example/pom.xml
@@ -23,13 +23,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.20.0</version>
                 <configuration>
                     <!-- Disable generateReports if you don't want to include the built-in reports -->
                     <generateReports>true</generateReports>
                     <generateSitemap>true</generateSitemap>
-                    <relativizeDecorationLinks>false</relativizeDecorationLinks>
-                    <locales>en</locales>
                     <inputEncoding>UTF-8</inputEncoding>
                     <outputEncoding>UTF-8</outputEncoding>
                     <!-- Ignore files prefixed with underscore -->
diff --git a/asciidoc-maven-site-parser-example/src/site/site.xml b/asciidoc-maven-site-parser-example/src/site/site.xml
@@ -1,4 +1,6 @@
-<project>
+<site xmlns="http://maven.apache.org/SITE/2.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
     <body>
         <menu ref="reports" inherit="top"/>
         <menu ref="modules"/>
@@ -10,6 +12,6 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.12.0</version>
+        <version>2.0.0-M11</version>
     </skin>
-</project>
+</site>
diff --git a/tests/src/test/java/org/asciidoctor/maven/examples/AsciidocMavenSiteConverterTest.java b/tests/src/test/java/org/asciidoctor/maven/examples/AsciidocMavenSiteConverterTest.java
@@ -15,25 +15,26 @@ class AsciidocMavenSiteConverterTest {
 
     @Test
     void shouldGenerateSitePages() {
-        File index = mavenProject.getTarget(sitePage("index.html"));
+        File index = mavenProject.getTarget(sitePage("index.html",""));
+        // Since maven-site v3.20.0 'About' is added to title
         assertThat(index)
                 .isNotEmpty()
                 .content()
                 .contains("<link rel=\"stylesheet\" href=\"./css/site.css\" />")
-                .contains("<h1>AsciiDoc Maven Site Example</h1>")
+                .contains("<h1>About AsciiDoc Maven Site Example</h1>")
                 .contains("<li class=\"nav-header\">Asciidoctor Example</li>")
-                .contains("<a href=\"hello.html\" title=\"Hello\"><span class=\"none\"></span>Hello</a>")
-                .contains("<a href=\"article.html\" title=\"Article\"><span class=\"none\"></span>Article</a>");
+                .contains("<li><a href=\"hello.html\">Hello</a></li>")
+                .contains("<li><a href=\"article.html\">Article</a></li>");
 
-        File hello = mavenProject.getTarget(sitePage("hello.html"));
+        File hello = mavenProject.getTarget(sitePage("hello.html",""));
         assertThat(hello)
                 .isNotEmpty()
                 .content()
                 .contains("<h1>Hello, AsciiDoc!</h1>")
                 .contains("<img src=\"images/tiger.png\" alt=\"Ghostscript Tiger\"/>")
                 .contains("<h2 id=\"attributes\">Attributes</h2>");
 
-        File article = mavenProject.getTarget(sitePage("article.html"));
+        File article = mavenProject.getTarget(sitePage("article.html", ""));
         assertThat(article)
                 .isNotEmpty()
                 .content()
@@ -45,7 +46,7 @@ void shouldGenerateSitePages() {
                 .contains("<h2 id=\"attributes\"><a class=\"anchor\" href=\"#attributes\"></a>Attributes</h2>");
     }
 
-    private String sitePage(String filename) {
-        return "site/" + filename;
+    private static String sitePage(String filename, String locale) {
+        return String.format("site/%s/%s", locale, filename);
     }
 }
diff --git a/tests/src/test/java/org/asciidoctor/maven/examples/AsciidocMavenSiteParserTest.java b/tests/src/test/java/org/asciidoctor/maven/examples/AsciidocMavenSiteParserTest.java
@@ -16,35 +16,36 @@ class AsciidocMavenSiteParserTest {
     @Test
     void shouldGenerateSitePages() {
         File index = mavenProject.getTarget(sitePage("index.html"));
+        // Since maven-site v3.20.0 'About' is added to title
         assertThat(index)
                 .isNotEmpty()
                 .content()
-                .contains("<h1>AsciiDoc Maven Site Example</h1>")
+                .contains("<h1>About AsciiDoc Maven Site Example</h1>")
                 .contains("<li class=\"nav-header\">Asciidoctor Example</li>")
-                .contains("<a href=\"hello.html\" title=\"Hello\"><span class=\"none\"></span>Hello</a>")
-                .contains("<a href=\"article.html\" title=\"Article\"><span class=\"none\"></span>Article</a>");
+                .contains("<li><a href=\"hello.html\">Hello</a></li>")
+                .contains("<li><a href=\"article.html\">Article</a></li>");
 
         File hello = mavenProject.getTarget(sitePage("hello.html"));
         assertThat(hello)
                 .isNotEmpty()
                 .content()
-                .contains("<h2>Hello, AsciiDoc!</h2>")
+                .contains("<h1>Hello, AsciiDoc!</h1>")
                 .contains("<div><img src=\"images/tiger.png\" alt=\"Ghostscript Tiger\" /></div>")
-                .contains("<h3><a name=\"attributes\"></a>Attributes</h3>");
+                .contains("<h2><a id=\"attributes\"></a>Attributes</h2>");
 
         File article = mavenProject.getTarget(sitePage("article.html"));
         assertThat(article)
                 .isNotEmpty()
                 .content()
-                .contains("<h2>AsciiDoc is Writing Zen</h2>")
-                .contains("<h4><a name=\"unordered_list\"></a>Unordered list</h4>")
-                .contains("<h4><a name=\"unordered_list\"></a>Unordered list</h4>")
-                .contains("<h4><a name=\"table\"></a>Table</h4>")
-                .contains("<h4><a name=\"code_blocks\"></a>Code blocks</h4>")
-                .contains("<h3><a name=\"attributes\"></a>Attributes</h3>");
+                .contains("<h1>AsciiDoc is Writing Zen</h1>")
+                .contains("<h3><a id=\"unordered_list\"></a>Unordered list</h3>")
+                .contains("<h3><a id=\"ordered_list\"></a>Ordered list</h3>")
+                .contains("<h3><a id=\"table\"></a>Table</h3>")
+                .contains("<h3><a id=\"code_blocks\"></a>Code blocks</h3>")
+                .contains("<h2><a id=\"attributes\"></a>Attributes</h2>");
     }
 
-    private String sitePage(String filename) {
+    private static String sitePage(String filename) {
         return "site/" + filename;
     }
 }
