diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5a8b8d1d..ee5b30f8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,29 +27,3 @@ updates: update-types: - "version-update:semver-major" - "version-update:semver-minor" - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "weekly" - labels: - - "dependencies" - commit-message: - prefix: "(v2.2.x)" - target-branch: "v2.2.x" - ignore: - - dependency-name: org.apache.maven:* - - dependency-name: org.apache.maven.plugin-tools:* - - dependency-name: org.apache.maven.doxia:* - - dependency-name: org.codehaus.plexus:* - - dependency-name: commons-io:commons-io - - dependency-name: org.mockito:mockito-core - update-types: - - "version-update:semver-major" - - dependency-name: org.glassfish.jaxb:jaxb-runtime - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a2be26f6..d1afdc7c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,14 +3,12 @@ on: push: branches: - main - - 2.2.x paths-ignore: - '*.adoc' - docs/** pull_request: branches: - main - - 2.2.x paths-ignore: - '*.adoc' - docs/** diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 8240cb3e..75ea55ab 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -3,7 +3,6 @@ on: push: branches: - main - - v2.2.x paths: [ 'docs/**' ] permissions: read-all jobs: diff --git a/README.adoc b/README.adoc index 3398be85..b8c5bf81 100644 --- a/README.adoc +++ b/README.adoc @@ -141,9 +141,7 @@ You can find examples ready to copy-paste in the {uri-examples}[Asciidoctor Mave asciidoctor-maven-plugin comes in two versions with support for Maven 3.8.8+ and 3.9.x versions. * Version 3.x.x: current development branch. -This is the recommended version, new features and fixes will be added as minor/patch releases. -* Version 2.2.x: maintenance branch. -Fixes will be released as patch versions up until 31st January 2025. +New features and fixes will be added as minor/patch releases. == Contributing diff --git a/docs/modules/plugin/pages/compatibility-matrix.adoc b/docs/modules/plugin/pages/compatibility-matrix.adoc index 6585724c..2e17da9e 100644 --- a/docs/modules/plugin/pages/compatibility-matrix.adoc +++ b/docs/modules/plugin/pages/compatibility-matrix.adoc @@ -23,8 +23,4 @@ Versions not listed below are not supported, please consider upgrading. |v2.x.x, v3.x.x |Yes -|v2.2.x -|v2.x.x -|Yes (EOL Dec, 2015) - |=== diff --git a/docs/modules/plugin/pages/v3-migration-guide.adoc b/docs/modules/plugin/pages/v3-migration-guide.adoc index 6e4bdc29..7c748bc7 100644 --- a/docs/modules/plugin/pages/v3-migration-guide.adoc +++ b/docs/modules/plugin/pages/v3-migration-guide.adoc @@ -21,7 +21,6 @@ Users of the site module see xref:site-integration:v3-migration-guide.adoc[v3 mi Minimal Java version is 11. -For anyone in need of a Java 8 compatible release, v2.5.x of the plugin will be supported for some time after v3.0.x release. Note this also imposes versions on dependencies, for example: * Only AsciidoctorJ v2.5.x diff --git a/docs/modules/site-integration/pages/v3-migration-guide.adoc b/docs/modules/site-integration/pages/v3-migration-guide.adoc index 4e47e2b6..0ed6640f 100644 --- a/docs/modules/site-integration/pages/v3-migration-guide.adoc +++ b/docs/modules/site-integration/pages/v3-migration-guide.adoc @@ -18,6 +18,15 @@ The old Doxia module embedded in `asciidocto-maven-plugin` library it's now an i == Changes +=== Minimal Java version + +Minimal Java version is 11. + +Note this also imposes versions on dependencies, for example: + +* Only AsciidoctorJ v2.5.x +* Only asciidoctorj-diagram previous v2.2.8 + === Site plugin module renamed The https://maven.apache.org/doxia/[Doxia] module has been extracted into a separated subproject named `{doxia-compatible-module-name}`.