From 5367ce1d6b85c97f5300f34a719364a09b82f8e2 Mon Sep 17 00:00:00 2001 From: Abel Salgado Romero Date: Sat, 18 Mar 2023 18:53:20 +0100 Subject: [PATCH] Bump Doxia to v1.12.0 and maven-site-plugin in IT to 3.12.1 --- CHANGELOG.adoc | 1 + README.adoc | 2 +- docs/antora.yml | 2 +- .../site-integration/pages/compatibility-matrix.adoc | 2 +- pom.xml | 11 ++++++++++- src/it/maven-site-plugin/pom.xml | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 79bd23a3..a09ac943 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -29,6 +29,7 @@ Build / Infrastructure:: * Delete unused TravisCI configuration (#622) * Bump Maven build plugins (#623) * Bump GH 'checkout' and 'setup-java' to v3 (#624) + * Bump Doxia to v1.12.0 and maven-site-plugin in IT to 3.12.1 (#) Documentation:: diff --git a/README.adoc b/README.adoc index b7d04f57..41d46e0b 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ // Metadata :release-version: 2.2.2 :docs-version: 2.2 -:maven-site-plugin-version: 3.9.0 +:maven-site-plugin-version: 3.12.1 // Settings :idprefix: :idseparator: - diff --git a/docs/antora.yml b/docs/antora.yml index e6d9b30d..5849e237 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -11,7 +11,7 @@ asciidoc: uri-examples: https://github.com/asciidoctor/asciidoctor-maven-examples uri-maven: https://maven.apache.org uri-maven-site-plugin: https://maven.apache.org/plugins/maven-site-plugin - maven-site-plugin-version: 3.10.0 + maven-site-plugin-version: 3.12.1 nav: - modules/plugin/nav.adoc - modules/site-integration/nav.adoc diff --git a/docs/modules/site-integration/pages/compatibility-matrix.adoc b/docs/modules/site-integration/pages/compatibility-matrix.adoc index 124a007f..120b978b 100644 --- a/docs/modules/site-integration/pages/compatibility-matrix.adoc +++ b/docs/modules/site-integration/pages/compatibility-matrix.adoc @@ -8,7 +8,7 @@ Release candidate releases are not accounted. |=== |Asciidoctor Maven Plugin | Maven Site Plugin | Supported -|v2.2.2 +|v2.2.2+ |v3.1x.x |Yes diff --git a/pom.xml b/pom.xml index 01de7eb6..da45e0db 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,15 @@ -7 + + abelsromero + Abel Salgado Romero + abelromero@gmail.com + + Contributor + + 1 + @@ -75,7 +84,7 @@ 3.0.23 1.7 4.1.90.Final - 1.11.1 + 1.12.0 diff --git a/src/it/maven-site-plugin/pom.xml b/src/it/maven-site-plugin/pom.xml index 3da78bca..5521c40f 100644 --- a/src/it/maven-site-plugin/pom.xml +++ b/src/it/maven-site-plugin/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.0 + 3.12.1 ${project.basedir}/src/site/asciidoc