diff --git a/CHANGELOG.md b/CHANGELOG.md index f535053a43..0b4ad42f47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ 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.11.3] - 2026-02-10 + +### Fixed +- IngressClassName to helm chart +- Enhanced error message including filename of corrupt file +- Internal server error for cat command on empty repository +- Application of mercurial configration (thanks to harbison72) +- Proxy exclusions with glob patterns +- External logos in plugin overview + +### Changed +- Update IntelliJ IDEA configuration documentation + ## [3.11.2] - 2026-01-12 ### Fixed - Update of Tika to mitigate CVE-2025-54988 and CVE-2025-66516 @@ -1837,3 +1850,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [3.10.3]: https://scm-manager.org/download/3.10.3 [3.11.0]: https://scm-manager.org/download/3.11.0 [3.11.2]: https://scm-manager.org/download/3.11.2 +[3.12.0]: https://scm-manager.org/download/3.12.0 diff --git a/docs/en/release-process.md b/docs/en/release-process.md index 53b828c80f..e7470f6dc0 100644 --- a/docs/en/release-process.md +++ b/docs/en/release-process.md @@ -98,23 +98,31 @@ To release a hotfix version of SCM-Manager (or in other words a version, that is ### Create hotfix branch -To trigger the release, create a hotfix branch on the tag you want to create the hotfix for (lets say, -that's version `2.30.0`) and prepare the release like above: +To trigger the release, create a hotfix branch on the support branch for the release you want to create the hotfix for +(lets say, that's version `3.12.0` and therefore support branch `support/3.12.x`) and prepare the release like above: ```bash -git checkout 2.30.0 -git checkout -b hotfix/2.30.1 +export HOTFIX_VERSION=3.12.1 +git checkout support/3.12.x +git checkout -b hotfix/${HOTFIX_VERSION} ``` Then apply your fixes (eg. by cherry picking the relevant commits) and update the `CHANGELOG.md` (if you -have single changelog yaml files, you could use the `updateChangelog` like above). Add the `CHANGELOG.md`, +have single changelog yaml files, you could use the `updateChangelog` like above). + +```bash +./gradlew :updateChangelog +``` + +Verify, that the new version from the update step is correct and 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" -git push origin hotfix/2.30.1 +git rm -rf gradle/changelog \ +&& git add CHANGELOG.md \ +&& git commit -m "Adjust changelog for release ${HOTFIX_VERSION}" \ +&& git push origin hotfix/${HOTFIX_VERSION} \ +&& xdg-open "https://ecosystem.cloudogu.com/jenkins/view/SCMM/job/SCM/job/scm-manager/job/scm-manager/job/hotfix%252F${HOTFIX_VERSION}/" ``` Jenkins will build and release the versions, create the new tag, but **will not** update the `main` or @@ -123,12 +131,12 @@ Jenkins will build and release the versions, create the new tag, but **will not* ### Update Branches Depending on whether you released a hotfix for an older version or the latest release, you have to update -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`: +the `main` branch to the new tag. So in our example, if there is no version `3.13.x` yet, the new version +`3.12.1` is the latest version and we have to update `main`: ```bash git checkout main -git merge 2.30.1 +git merge ${HOTFIX_VERSION} git push origin main ``` @@ -147,11 +155,12 @@ How these conflicts should be merged depends on the version that has been releas - If it has been a hotfix for an older version, you could keep the SNAPSHOT versions and simply discard the released version. - If the hotfix is the new main, you should take this new version and then manually create a new SNAPSHOT - based on the new hotfix version number using gradle: `./gradlew setVersionToNextSnapshot`. + based on the new hotfix version number using gradle: `./gradlew setVersionToNextSnapshot fix`. Commit these changes + with `git commit -am "Prepare for next development iteration"`. ## How to release SCM-Manager plugins -To release a new version of a Plugin for SCM-Manager you have to do the following steps (replace placeholder `` accordingly, eg. with `2.1.0`): +To release a new version of a Plugin for SCM-Manager you have to do the following steps: ### Check out default branch diff --git a/gradle/changelog/cat_command.yaml b/gradle/changelog/cat_command.yaml deleted file mode 100644 index bfb73f2260..0000000000 --- a/gradle/changelog/cat_command.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Internal server error for cat command on empty repository diff --git a/gradle/changelog/error.yaml b/gradle/changelog/error.yaml deleted file mode 100644 index bf58b8ca4e..0000000000 --- a/gradle/changelog/error.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Enhanced error message including filename of corrupt file diff --git a/gradle/changelog/helm_ingress_class.yaml b/gradle/changelog/helm_ingress_class.yaml deleted file mode 100644 index 7f6f9e4e54..0000000000 --- a/gradle/changelog/helm_ingress_class.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: added - description: IngressClassName to helm chart diff --git a/gradle/changelog/hg.yaml b/gradle/changelog/hg.yaml deleted file mode 100644 index 56b27554b1..0000000000 --- a/gradle/changelog/hg.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Application of mercurial configration (thanks to harbison72) diff --git a/gradle/changelog/logo.yaml b/gradle/changelog/logo.yaml deleted file mode 100644 index e213ec107d..0000000000 --- a/gradle/changelog/logo.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: External logos in plugin overview diff --git a/gradle/changelog/proxy_exclusions.yaml b/gradle/changelog/proxy_exclusions.yaml deleted file mode 100644 index 890c97ade7..0000000000 --- a/gradle/changelog/proxy_exclusions.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Proxy exclusions with glob patterns diff --git a/gradle/changelog/update_intellij_config.yaml b/gradle/changelog/update_intellij_config.yaml deleted file mode 100644 index cd919c53da..0000000000 --- a/gradle/changelog/update_intellij_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: changed - description: Update IntelliJ IDEA configuration documentation