Skip to content

Commit

Permalink
Remove v2.x.x branch support as it reaches OES (#1020)
Browse files Browse the repository at this point in the history
* Remove references in docs docs
* Removed from CI
* Remove docs publication
* Extra: updated site v3-migration-guide to mention Java 11 requirement
  • Loading branch information
abelsromero authored Feb 2, 2025
1 parent 6e59442 commit b5b30bb
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 37 deletions.
26 changes: 0 additions & 26 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- v2.2.x
paths: [ 'docs/**' ]
permissions: read-all
jobs:
Expand Down
4 changes: 1 addition & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions docs/modules/plugin/pages/compatibility-matrix.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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)

|===
1 change: 0 additions & 1 deletion docs/modules/plugin/pages/v3-migration-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions docs/modules/site-integration/pages/v3-migration-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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}`.
Expand Down

0 comments on commit b5b30bb

Please sign in to comment.