From 54b28f98f76941caf446f3bd8d4707366f3ccb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 12 Mar 2025 15:07:49 +0100 Subject: [PATCH] Adjust changelog for release 3.7.4 --- CHANGELOG.md | 5 +++++ docs/en/release-process.md | 6 +++--- gradle/changelog/form_config.yaml | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 gradle/changelog/form_config.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da3aba188..d6d09c356e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.7.4] - 2025-03-12 +### Fixed +- Possibility to configure 'maxFormKeys' and 'maxFormContentSize' in Jetty + ## [3.7.3] - 2025-02-24 ### Fixed - Keep original timestamp on rebase @@ -1705,3 +1709,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [3.7.0]: https://scm-manager.org/download/3.7.0 [3.7.1]: https://scm-manager.org/download/3.7.1 [3.7.3]: https://scm-manager.org/download/3.7.2 +[3.7.4]: https://scm-manager.org/download/3.7.4 diff --git a/docs/en/release-process.md b/docs/en/release-process.md index f30958c2f5..e1318516e0 100644 --- a/docs/en/release-process.md +++ b/docs/en/release-process.md @@ -109,7 +109,7 @@ Then apply your fixes (eg. by cherry picking the relevant commits) and update th have single changelog yaml files, you could use the `updateChangelog` like above). Add the `CHANGELOG.md`, remove the yamls, and push the hotfix branch: -``` +```bash git rm -rf gradle/changelog git add CHANGELOG.md git commit -m "Adjust changelog for release 2.30.1" @@ -125,7 +125,7 @@ Depending on whether you released a hotfix for an older version or the latest re the `main` branch to the new tag. So in our example, if there is no version `2.31.x` yet, the new version `2.30.1` is the latest version and we have to update `main`: -``` +```bash git checkout main git merge 2.30.1 git push origin main @@ -136,7 +136,7 @@ that there are no changes that all changes are part of the current `develop` sta to merge conflicts, because the version on `develop` has been set to a new `SNAPSHOT`, while the version of the hotfix has been updated to the new release version. So you have to merge all these conflicts manually. -``` +```bash git checkout develop git merge main ``` diff --git a/gradle/changelog/form_config.yaml b/gradle/changelog/form_config.yaml deleted file mode 100644 index ae655b4c1a..0000000000 --- a/gradle/changelog/form_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Possibility to configure 'maxFormKeys' and 'maxFormContentSize' in Jetty