Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compatibility matrix #569

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ on:
push:
branches:
- main
paths-ignore:
- README.adoc
- docs/**
pull_request:
branches:
- main
paths-ignore:
- README.adoc
- docs/**

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Documentation::

* Add ID's for all parameters of process-asciidoc, auto-refresh and http mojo, to be able to generate direct urls (https://github.com/uniqueck[@uniqueck]) (#533)
* Clarify where to put the plugin section in `pom.xml` (#558)
* Add compatibility matrix (#569)

Bug Fixes::

Expand Down
3 changes: 2 additions & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ version: '2.2'
asciidoc:
attributes:
release-version: 2.2.1
maven-site-plugin-version: 3.9.0
project-repo: asciidoctor/asciidoctor-maven-plugin
uri-asciidoc: https://asciidoc.org
uri-asciidoctor: https://asciidoctor.org
uri-asciidoctorj: https://github.com/asciidoctor/asciidoctorj
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
nav:
- modules/plugin/nav.adoc
- modules/site-integration/nav.adoc
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ The conversion can happen in 2 flavors:

. As a xref:plugin:introduction.adoc[Maven plugin]: AsciiDoc files are converted at full Asciidoctor power independently from Maven site,

. As a xref:site-integration:index.adoc[Maven site module]: AsciiDoc files are integrated with https://maven.apache.org/doxia/[Maven Doxia] tools, however, with a few limitations.
. As a xref:site-integration:introduction.adoc[Maven site module]: AsciiDoc files are integrated with https://maven.apache.org/doxia/[Maven Doxia] tools, however, with a few limitations.
1 change: 1 addition & 0 deletions docs/modules/plugin/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*** xref:goals/http.adoc[]
** xref:usage.adoc[]
** xref:command-line-configuration.adoc[]
** xref:compatibility-matrix.adoc[]
** xref:examples.adoc[]
** Help & Guides
*** xref:tips-and-tricks.adoc[]
Expand Down
23 changes: 23 additions & 0 deletions docs/modules/plugin/pages/compatibility-matrix.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
= Compatibility Matrix

Here is the list of supported versions alongside the required {uri-asciidoctorj}[Asciidoctorj] version.
Release candidate releases are not accounted.

== Versions

|===
|Asciidoctor Maven Plugin | AsciidoctorJ | Supported

|v2.x.x
|v2.x.x
|Yes

|v1.6.0
|v1.5.x, v1.6.x
|No

|v1.5.x
|v1.5.x
|No

|===
4 changes: 3 additions & 1 deletion docs/modules/site-integration/nav.adoc
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
* Maven Site Integration
** xref:index.adoc[]
** xref:introduction.adoc[]
** xref:setup-and-configuration.adoc[]
** xref:compatibility-matrix.adoc[]
19 changes: 19 additions & 0 deletions docs/modules/site-integration/pages/compatibility-matrix.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
= Compatibility Matrix

Here is the list of supported versions alongside the required {uri-maven-site-plugin}[Maven Site Plugin] version.
Release candidate releases are not accounted.

== Versions

|===
|Asciidoctor Maven Plugin | Maven Site Plugin | Supported

|v2.1.x ~ v2.2.1
|v3.4 ~ v3.9.1
|Yes

|v1.5.6 ~ v1.6.0
|v3.4 ~ v3.9.1
|No

|===
6 changes: 6 additions & 0 deletions docs/modules/site-integration/pages/introduction.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
= Introduction
:maven-doxia-url: https://maven.apache.org/doxia/

The Asciidoctor Maven Site integration provides a {maven-doxia-url}[Maven Doxia] module to author your content with the {Maven Site Plugin}[maven-site-plugin].

Read the xref:setup-and-configuration.adoc#_setup[setup] section to know about how start using it.
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
= Maven Site Integration
:navtitle: Setup & Configuration
= Setup & Configuration

== Setup

To author your Maven-generated site in AsciiDoc, you must first add a dependency on the Asciidoctor plugin to your maven-site-plugin declaration (which more precisely adds a Doxia Parser Module).

IMPORTANT: Maven v3.2.1 or above required, and since asciidoctor-maven-plugin v1.5.6 only maven-site-plugin v3.4 or above is supported.

[source,xml,subs=attributes+]
.Maven site integration
-----
Expand All @@ -15,7 +12,7 @@ IMPORTANT: Maven v3.2.1 or above required, and since asciidoctor-maven-plugin v1
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>{maven-site-plugin-version}</version>
<dependencies>
<dependency> <!-- Add Asciidoctor Doxia Parser Module -->
<groupId>org.asciidoctor</groupId>
Expand Down