From c5058481b6fe82f6ead511b924f61202c3b00a20 Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Sat, 13 Jan 2024 17:28:30 +0100
Subject: [PATCH] WIP: manual rebase

---
 asciidoctor-converter-doxia-module/pom.xml    | 55 +-----------------
 asciidoctor-parser-doxia-module/pom.xml       | 56 ++-----------------
 .../src/it/maven-site-plugin/pom.xml          |  2 +-
 .../it/maven-site-plugin/src/site/site.xml    |  2 +-
 .../src/it/maven-site-plugin/validate.groovy  |  2 +-
 .../OrderedListNodeProcessorTest.java         | 10 ++--
 pom.xml                                       |  3 +-
 7 files changed, 17 insertions(+), 113 deletions(-)

diff --git a/asciidoctor-converter-doxia-module/pom.xml b/asciidoctor-converter-doxia-module/pom.xml
index aab6077b..3f8a3976 100644
--- a/asciidoctor-converter-doxia-module/pom.xml
+++ b/asciidoctor-converter-doxia-module/pom.xml
@@ -17,12 +17,6 @@
     <description>Asciidoctor Doxia Parser based on Asciidoctor Html converter (for Maven Site integration)</description>
     <url>https://github.com/asciidoctor/asciidoctor-maven-plugin</url>
 
-    <properties>
-        <doxia.version>2.0.0-M8</doxia.version>
-        <maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
-        <plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.asciidoctor</groupId>
@@ -42,7 +36,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>${maven.project.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,7 +47,7 @@
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-site-renderer</artifactId>
-            <version>${doxia.version}</version>
+            <version>${doxia-site-renderer.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -63,7 +57,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
-                <version>${plexus.component.metadata.version}</version>
+                <version>${plexus-component-metadata.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -75,51 +69,8 @@
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>${maven.coveralls.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.glassfish.jaxb</groupId>
-                        <artifactId>jaxb-runtime</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.codehaus.plexus</groupId>
-                                        <artifactId>plexus-component-metadata</artifactId>
-                                        <versionRange>[${plexus.component.metadata.version},)</versionRange>
-                                        <goals>
-                                            <goal>generate-metadata</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute/>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
 </project>
diff --git a/asciidoctor-parser-doxia-module/pom.xml b/asciidoctor-parser-doxia-module/pom.xml
index a317851d..ce45159e 100644
--- a/asciidoctor-parser-doxia-module/pom.xml
+++ b/asciidoctor-parser-doxia-module/pom.xml
@@ -15,12 +15,7 @@
 
     <name>Asciidoctor Parser Doxia Module</name>
     <description>Asciidoctor Doxia Module based on Asciidoctor AST processing (for Maven Site integration)</description>
-
-    <properties>
-        <doxia.version>2.0.0-M6</doxia.version>
-        <maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
-        <plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
-    </properties>
+    <url>https://github.com/asciidoctor/asciidoctor-maven-plugin</url>
 
     <dependencies>
         <dependency>
@@ -41,7 +36,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>${maven.project.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -57,7 +52,7 @@
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-site-renderer</artifactId>
-            <version>${doxia.version}</version>
+            <version>${doxia-site-renderer.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -67,7 +62,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
-                <version>${plexus.component.metadata.version}</version>
+                <version>${plexus-component-metadata.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -79,51 +74,8 @@
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>${maven.coveralls.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.glassfish.jaxb</groupId>
-                        <artifactId>jaxb-runtime</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.codehaus.plexus</groupId>
-                                        <artifactId>plexus-component-metadata</artifactId>
-                                        <versionRange>[${plexus.component.metadata.version},)</versionRange>
-                                        <goals>
-                                            <goal>generate-metadata</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute/>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
 </project>
diff --git a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/pom.xml b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/pom.xml
index 29c78e0c..025e5409 100644
--- a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/pom.xml
+++ b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/pom.xml
@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>4.0.0-M8</version>
+                <version>4.0.0-M13</version>
                 <configuration>
                     <asciidoc>
                         <baseDir>${project.basedir}/src/site/asciidoc</baseDir>
diff --git a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/src/site/site.xml b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/src/site/site.xml
index 55fcb658..d03ea814 100644
--- a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/src/site/site.xml
+++ b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/src/site/site.xml
@@ -9,6 +9,6 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>2.0.0-M6</version>
+        <version>2.0.0-M8</version>
     </skin>
 </project>
diff --git a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy
index 940a4582..9c66ce92 100644
--- a/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy
+++ b/asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy
@@ -127,7 +127,7 @@ class HtmlAsserter {
     }
 
     void containsOrderedList(String... values) {
-        def found = find("<ol style=\"list-style-type: decimal\"><li>${values.join('</li><li>')}</li></ol>")
+        def found = find("<ol style=\"list-style-type: decimal;\"><li>${values.join('</li><li>')}</li></ol>")
         assertFound("Ordered list", values.join(','), found)
     }
 
diff --git a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/ast/processors/OrderedListNodeProcessorTest.java b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/ast/processors/OrderedListNodeProcessorTest.java
index 6fb7687f..d97ba86b 100644
--- a/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/ast/processors/OrderedListNodeProcessorTest.java
+++ b/asciidoctor-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/ast/processors/OrderedListNodeProcessorTest.java
@@ -39,7 +39,7 @@ void should_convert_simple_list() {
         String html = process(content);
 
         assertThat(html)
-                .isEqualTo("<ol style=\"list-style-type: decimal\">" +
+                .isEqualTo("<ol style=\"list-style-type: decimal;\">" +
                         "<li>ordered item 1</li>" +
                         "<li>ordered item 2</li></ol>");
     }
@@ -51,15 +51,15 @@ void should_convert_nested_list() {
         String html = process(content);
 
         assertThat(html)
-                .isEqualTo("<ol style=\"list-style-type: decimal\">" +
+                .isEqualTo("<ol style=\"list-style-type: decimal;\">" +
                         "<li>ordered item 1" +
-                        "<ol style=\"list-style-type: decimal\">" +
+                        "<ol style=\"list-style-type: decimal;\">" +
                         "<li>ordered item 1 1</li></ol></li>" +
                         "<li>ordered item 1 2</li>" +
                         "<li>ordered item 2" +
-                        "<ol style=\"list-style-type: decimal\">" +
+                        "<ol style=\"list-style-type: decimal;\">" +
                         "<li>ordered item 2 1" +
-                        "<ol style=\"list-style-type: decimal\">" +
+                        "<ol style=\"list-style-type: decimal;\">" +
                         "<li>ordered item 2 1 1</li></ol></li></ol></li></ol>");
     }
 
diff --git a/pom.xml b/pom.xml
index dfa74243..34d9b64e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.java.version>11</project.java.version>
         <maven.version>3.9.6</maven.version>
-        <doxia.version>1.12.0</doxia.version>
+        <doxia.version>2.0.0-M7</doxia.version>
+        <doxia-site-renderer.version>2.0.0-M6</doxia-site-renderer.version>
         <plexus-component-metadata.version>2.2.0</plexus-component-metadata.version>
         <asciidoctorj.version>2.5.11</asciidoctorj.version>
         <jruby.version>9.4.5.0</jruby.version>