diff --git a/CHANGELOG.md b/CHANGELOG.md index 07af41a83..28c4f4c77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ -3.3.0 (unreleased) +3.3.0 (2024-03-01) ------------------ ### Configuration diff --git a/NEWS.md b/NEWS.md index 185b59984..fc678a421 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,8 +10,8 @@ This file lists all changes which have an affect on the administration of IntelM Please refer to the change log for a full list of changes. -3.3.0 Feature release (unreleased) ---------------------------------- +3.3.0 Feature release (2024-03-01) +--------------------- ### Documentation The documentation is now available at [docs.intelmq.org](https://docs.intelmq.org/). Documentation has been updated and restructured into User, Administrator and Developer Guide. It provides modern look with various quality of life improvements. Big thanks to to @gethvi. diff --git a/debian/changelog b/debian/changelog index 19c1c38a6..ac9ddbe81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -intelmq (3.2.2a1-1) UNRELEASED; urgency=medium +intelmq (3.3.0-1) stable; urgency=medium - * + * 3.3.0 Feature release - -- Sebastian Wagner Tue, 05 Sep 2023 15:05:07 +0200 + -- Aaron Kaplan Fr, 01 Mar 2024 14:19:00 +0100 intelmq (3.2.1-2) stable; urgency=medium diff --git a/docs/dev/release.md b/docs/dev/release.md index 25e0dd753..7d9983b04 100644 --- a/docs/dev/release.md +++ b/docs/dev/release.md @@ -17,7 +17,7 @@ different. - Check the upgrade functions in `intelmq/lib/upgrades.py`. - Close the milestone on GitHub and move any open issues to the next one. -- `docs/user/installation.rst`: Update supported operating systems. +- `docs/admin/installation/linux-packages.md`: Update supported operating systems. ## Documentation @@ -39,22 +39,21 @@ Eventually adapt the default log levels if necessary. Should be INFO for stable ### IntelMQ Manager - `intelmq_manager/version.py`: Update the version. -- `intelmq_manager/static/images/js/about.js`: Update the version. +- `intelmq_manager/static/js/about.js`: Update the version. ## Commit, push, review and merge -Commit your changes in a separate branch, the final commit message -should start with `REL:`. Push and create a pull request to maintenance -and after that from maintenance to master. Someone else should review -the changes. Eventually fix them, make sure the `REL:` is the last -commit, you can also push that one at last, after the reviews. +Commit your changes in a separate branch, the final commit message should start +with `REL:`. Push and create a pull request to the `develop` branch. Someone +else should review the changes. Eventually fix them, make sure the `REL:` is +the last commit, you can also push that one at last, after the reviews. Why a separate branch? Because if problems show up, you can still force-push to that one, keeping the release commit the latest one. ## Tag and release -Tag the commit with `git tag -s version HEAD`, merge it into master, +Tag the commit with `git tag -s version HEAD`, merge it into `develop`, push the branches *and* the tag. The tag is just `a.b.c`, not prefixed with `v` (that was necessary only with SVN a long time ago...). diff --git a/docs/index.md b/docs/index.md index cf097897c..1b55da37f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,6 +9,7 @@ ![IntelMQ](docs/static/images/Logo_Intel_MQ.svg) + # Introduction **IntelMQ** is a solution for IT security teams (CERTs & CSIRTs, SOCs diff --git a/intelmq/version.py b/intelmq/version.py index 45127749e..ccb58cc79 100644 --- a/intelmq/version.py +++ b/intelmq/version.py @@ -2,5 +2,5 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -__version_info__ = (3, 2, 2, 'a1') +__version_info__ = (3, 3, 0) __version__ = '.'.join(map(str, __version_info__))