diff --git a/.github/SECURITY.md b/.github/SECURITY.md index f8ff1f1..07ed743 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -If a security issue occurs, only the latest version is guaranteed to be patched. +If a security issue occurs, only the latest versions of v3.x and v2.x are guaranteed to be patched. ## Reporting a Vulnerability diff --git a/.github/website.sh b/.github/website.sh index b16fd0d..11ca25c 100644 --- a/.github/website.sh +++ b/.github/website.sh @@ -21,4 +21,7 @@ git commit --message "Update joda-convert from CI: $GITHUB_ACTION" echo "## push..." git push origin main +git push --delete origin website || true +git push --delete origin website2x || true + echo "## done" diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 784c35c..2aa7b25 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -7,7 +7,7 @@ - + Major version based on Java SE 21. Intended to be effectively compatible with v2.x. @@ -29,6 +29,17 @@ New methods to find a converter returning `Optional`. + + + Update dependencies. + Setup build system to be a maintainance branch. + + + + + See v3.0.0 above. + + Support classes that define `@FromString` but not `@ToString`. diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index edcb953..269b0a3 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -75,9 +75,9 @@ then the annotations are checked. If they are found, then the methods are called ## Releases -The 3.x branch is compatible with Java SE 21 or later. +The 3.x branch (v3.0.0) is compatible with Java SE 21 or later. -The 2.x branch is compatible with Java SE 6 or later. +The 2.x branch (v2.2.4) is compatible with Java SE 6 or later. v3.x releases are compatible with v2.x releases, however the `module-info.class` file is always present, and the oldest development pre-release of JSR-310 is not recognized. @@ -92,7 +92,7 @@ Available in the [Maven Central repository](https://search.maven.org/search?q=g: org.joda joda-convert - 2.2.3 + 3.0.0 ```