From a622aad4e50b6aefc0b463e8ebddbe7000aa161f Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Tue, 1 Oct 2024 22:25:44 +0100 Subject: [PATCH] Prepare for v2.0.0 * Update Joda-Convert to fully modular v3.0.1 * Rework various doc files --- .github/SECURITY.md | 2 +- README.md | 3 +-- RELEASE-NOTES.txt | 2 +- pom.xml | 8 ++++---- src/changes/changes.xml | 4 ++-- src/site/markdown/index.md | 7 ++++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index f8ff1f1..cebd68a 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 v2.x and v1.x are guaranteed to be patched. ## Reporting a Vulnerability diff --git a/README.md b/README.md index e6cd44e..e94dbc0 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,7 @@ Tidelift will coordinate the fix and disclosure. * Update version (index.md, changes.xml) * Commit and push -* In an admin window `gpg-connect-agent -v` -* Switch to Java 11 +* Switch to Java 21 * `mvn clean release:clean release:prepare release:perform` * `git fetch` * Website will be built and released by GitHub Actions diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 29155fc..63c38a9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -4,7 +4,7 @@ Joda-Money Joda-Money is a monetary library that fills the gap in the JDK by providing a Money class and associated formatting. -The release runs on JDK 6 or later. +The release runs on JDK 21 or later. See https://www.joda.org/joda-money/changes-report.html for changes diff --git a/pom.xml b/pom.xml index df5ed29..355f5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ joda-money jar Joda-Money - 2.0.0-RC1-SNAPSHOT + 2.0.0-SNAPSHOT Money representation and formatting, compatible with Java 21+ https://www.joda.org/joda-money/ @@ -880,7 +880,7 @@ 3.26.3 - 2.2.3 + 3.0.1 5.11.0 @@ -904,12 +904,12 @@ 3.10.1 3.5.0 3.15.0 - 3.25.0 + 3.24.0 3.6.2 3.1.1 2.4 3.3.1 - 3.12.1 + 3.12.1 3.3.1 3.5.0 3.5.0 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c22dd49..be7bab9 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -8,10 +8,10 @@ - + Major version based on Java SE 21. - Intended to be effectively compatible with v1.x. + Intended to be fully compatible with v1.x. diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 22aad81..65a9f41 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -70,9 +70,9 @@ As a flavour of Joda-Money, here is some example code: ## Releases -The 2.x branch is compatible with Java SE 21 or later. +The 2.x branch (v2.0.0) is compatible with Java SE 21 or later. -The 1.x branch is compatible with Java SE 8 or later. +The 1.x branch (v1.0.5) is compatible with Java SE 8 or later. v2.x releases are compatible with v1.x releases - except for the Java SE version and `module-info.class` file. @@ -81,12 +81,13 @@ There is a *compile-time* dependency on [Joda-Convert](https://www.joda.org/joda but this is not required at runtime thanks to the magic of annotations. Available in [Maven Central](https://search.maven.org/search?q=g:org.joda%20AND%20a:joda-money&core=gav). +[GitHub release bundles](https://github.com/JodaOrg/joda-money/releases). ```xml org.joda joda-money - 1.0.5 + 2.0.0 ```