Skip to content

Commit

Permalink
Use latest Maven Doxia (#719)
Browse files Browse the repository at this point in the history 
* Similar to PR #717, to ease project maintenance
we can automate Doxia dependencies and use CI
to validate backward compatibility.
* Move Doxia properties to parent pom
  • Loading branch information
@abelsromero
abelsromero authored Jan 1, 2024
1 parent 8130ba9 commit 7a02121
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 76 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
39 changes: 2 additions & 37 deletions asciidoctor-converter-doxia-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
39 changes: 2 additions & 37 deletions asciidoctor-parser-doxia-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
2 changes: 2 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 7a02121

Please sign in to comment.