Use latest Maven Doxia (asciidoctor#719)

* Similar to PR asciidoctor#717, to ease project maintenance we can automate Doxia dependencies and use CI to validate backward compatibility. * Move Doxia properties to parent pom
abelsromero · Jan 1, 2024 · 7a02121 · 7a02121
1 parent 8130ba9
commit 7a02121
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 76 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -18,8 +18,6 @@ updates:
     ignore:
       - dependency-name: org.jruby:jruby
       - dependency-name: org.apache.maven:*
-      - dependency-name: org.apache.maven.doxia:*
-      - dependency-name: org.codehaus.plexus:*
       - dependency-name: org.glassfish.jaxb:jaxb-runtime
         update-types:
           - "version-update:semver-major"

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -59,6 +59,7 @@ Build / Infrastructure::
   * Test Javadoc generation in CI (#690)
   * Fix maven-deploy-plugin and prerequisites Maven warnings (#709)
   * Use latest maven-plugin-tools and remove Dependabot exclusion (CI test ensure backward compatibility) (#717)
+  * Use latest Maven Doxia and remove Dependabot exclusion (CI test ensure backward compatibility) (#719)
 
 Maintenance::
   * Replace use of reflection by direct JavaExtensionRegistry calls to register extensions (#596)

diff --git a/asciidoctor-converter-doxia-module/pom.xml b/asciidoctor-converter-doxia-module/pom.xml
@@ -17,11 +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>1.11.1</doxia.version>
-        <plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.asciidoctor</groupId>
@@ -52,7 +47,7 @@
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-site-renderer</artifactId>
-            <version>${doxia.version}</version>
+            <version>1.11.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -62,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>
@@ -76,36 +71,6 @@
                 <artifactId>coveralls-maven-plugin</artifactId>
             </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
@@ -16,11 +16,6 @@
     <name>Asciidoctor Parser Doxia Module</name>
     <description>Asciidoctor Doxia Module based on Asciidoctor AST processing (for Maven Site integration)</description>
 
-    <properties>
-        <doxia.version>1.11.1</doxia.version>
-        <plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.asciidoctor</groupId>
@@ -56,7 +51,7 @@
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-site-renderer</artifactId>
-            <version>${doxia.version}</version>
+            <version>1.11.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -66,7 +61,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>
@@ -80,36 +75,6 @@
                 <artifactId>coveralls-maven-plugin</artifactId>
             </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/pom.xml b/pom.xml
@@ -72,6 +72,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.java.version>11</project.java.version>
         <maven.project.version>3.9.1</maven.project.version>
+        <doxia.version>1.12.0</doxia.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>
     </properties>