From f6b9d64a5fab73af2eee9d35218b4aed2385cfac Mon Sep 17 00:00:00 2001 From: Joe Lauer Date: Thu, 7 Dec 2023 13:45:08 -0500 Subject: [PATCH] Prepare for release of v7.0.0 --- ninja-core/src/site/markdown/developer/changelog.md | 3 ++- ninja-core/src/site/markdown/developer/getting_started.md | 2 +- .../src/site/markdown/documentation/upgrade_guide.md | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ninja-core/src/site/markdown/developer/changelog.md b/ninja-core/src/site/markdown/developer/changelog.md index 47ca315c69..f2122f4dc6 100644 --- a/ninja-core/src/site/markdown/developer/changelog.md +++ b/ninja-core/src/site/markdown/developer/changelog.md @@ -1,7 +1,8 @@ -Version 7.x.x +Version 7.0.0 ============= * 2023-12-07 Full support for Java 21 (compiling, testing, etc.) (jjlauer) +* 2023-12-07 Updated Guice dependency to v6.0.0 (jjlauer) * 2023-12-07 Updated Jetty dependency to v9.4.53.v20231009 (jjlauer) * 2023-12-07 Github workflow automated CI for Java 8, 11, 17, and 21 (jjlauer) * 2023-12-07 Updated Mockito dependency for testing to v4.11.0 for Java 8, v5.4.0 for Java 9+ (jjlauer) diff --git a/ninja-core/src/site/markdown/developer/getting_started.md b/ninja-core/src/site/markdown/developer/getting_started.md index 81f46593a0..cd40681ee3 100644 --- a/ninja-core/src/site/markdown/developer/getting_started.md +++ b/ninja-core/src/site/markdown/developer/getting_started.md @@ -61,7 +61,7 @@ Making a Ninja release - Make sure you are using https://semver.org/ for versioning. - Make sure changelog.md is updated -- Make sure upgrade-guide top version is updated +- Make sure ninja-core/src/site/markdown/documentation/upgrade_guide.md top version is updated - Make sure the archetypes are up-to-date (Ninja version must match release version) - Make sure the archetypes version in docu (JPA + getting_started) matches release version diff --git a/ninja-core/src/site/markdown/documentation/upgrade_guide.md b/ninja-core/src/site/markdown/documentation/upgrade_guide.md index 0c93e582c8..948c9e4c9a 100644 --- a/ninja-core/src/site/markdown/documentation/upgrade_guide.md +++ b/ninja-core/src/site/markdown/documentation/upgrade_guide.md @@ -6,6 +6,12 @@ into Ninja's behavior. This document describes which steps are needed to upgrade your application to the latest Ninja version. Simply start with your current version and then work your way up to the top of the document. +to 7.0.0 +-------- + +Version should be a drop-in replacement if using v6.8.2, but with Google guice v6.0.0 +you may need to ensure any of your projects dependencies are not bringing in Guava version older +than v31 (older versions will cause injection to fail) to 6.8.2 -------- @@ -345,4 +351,4 @@ From 1.1 to 1.2 From 1.0 to 1.1 --------------- -no changes needed. \ No newline at end of file +no changes needed.