diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f545f5bc08..4165ee6a677 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # Fluent Bit Version set(FLB_VERSION_MAJOR 5) -set(FLB_VERSION_MINOR 0) -set(FLB_VERSION_PATCH 9) +set(FLB_VERSION_MINOR 1) +set(FLB_VERSION_PATCH 0) set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}") set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 138b398ad5b..183d1372a3e 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -6,15 +6,16 @@ This document outlines the maintenance strategy and version support for Fluent B | Branch | Version | Status | Maintainer | Notes | |------------|--------------------|---------------------|-------------------------------------------------------------|--------------------------------------------------------------------| -| `master` | v5.0 (development) | Active development | [Eduardo Silva](https://github.com/edsiper) | All new features and bug fixes land here first | -| `4.2` | v4.2.x | Stable | [Eduardo Silva](https://github.com/edsiper) [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Current stable release series. Active development and updates. May receive minor enhancements in addition to fixes. | +| `master` | v5.1 (development) | Active development | [Eduardo Silva](https://github.com/edsiper) | Next minor development line. All new features and bug fixes land here first | +| `5.0` | v5.0.x | Stable | [Eduardo Silva](https://github.com/edsiper) [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Current stable release series. Receives bug fixes, security fixes, and selected low-risk backports. | +| `4.2` | v4.2.x | Maintenance only | [Eduardo Silva](https://github.com/edsiper) [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Critical fixes and safe backports only. Maintained until **July 30, 2026** | | `4.1` | v4.1.x | Maintenance only | [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Critical fixes and safe backports only. Maintained until **February 28, 2026** | --- ## Maintenance Policy -Active development is currently on Fluent Bit **v5.0** (tracked in the `master` branch). The **v4.2** branch is the current stable release series and receives active updates. Previous release lines enter **maintenance mode** after the next major/minor release. +Active development is currently on the next Fluent Bit **v5.1** line (tracked in the `master` branch). The **v5.0** branch is the current stable release series and receives stable branch updates. Previous release lines enter **maintenance mode** after the next major/minor release. ### Accepted Changes for Maintenance Branches @@ -26,9 +27,13 @@ Active development is currently on Fluent Bit **v5.0** (tracked in the `master` Maintenance releases continue on an as-needed basis depending on urgency and impact. -### v4.2 Stable Series +### v5.0 Stable Series -**v4.2** is the current stable release series and receives active development, bug fixes, and security updates. This is the recommended version for production use. +**v5.0** is the current stable release series and receives bug fixes, security updates, and selected low-risk backports. This is the recommended version for production use. + +### v4.2 Maintenance + +**v4.2** has entered **maintenance mode** and receives critical fixes and safe backports until **July 30, 2026** (as specified in [SECURITY.md](SECURITY.md)). ### v4.1 Maintenance @@ -44,11 +49,12 @@ Maintenance releases continue on an as-needed basis depending on urgency and imp ## How to Contribute to Maintained Versions -If you're submitting a fix or feature relevant to a stable or maintenance branch (v4.2 or v4.1): +If you're submitting a fix or feature relevant to a stable or maintenance branch (v5.0, v4.2, or v4.1): - Open your PR against the `master` branch -- Add a note in the PR or issue: `Target: v4.2` or `Target: v4.1` +- Add a note in the PR or issue: `Target: v5.0`, `Target: v4.2`, or `Target: v4.1` - Tag the branch maintainer to request backport consideration: + - For v5.0: [@edsiper](https://github.com/edsiper) [@cosmo0920](https://github.com/cosmo0920) - For v4.2: [@edsiper](https://github.com/edsiper) [@cosmo0920](https://github.com/cosmo0920) - For v4.1: [@cosmo0920](https://github.com/cosmo0920) diff --git a/README.md b/README.md index 73c28a7c50a..4cbb189f390 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Fluent Bit supports a wide array of platforms, including Linux, Windows, MacOS, ## 📌 Roadmap & Maintenance We follow a fast-paced development cycle, with major releases every 3–4 months. -The active development branch (`master`) is currently focused on **v5.0** (development). +The active development branch (`master`) is currently focused on **v5.1** (development). For version-specific maintenance timelines and policies, see our [MAINTENANCE.md](https://github.com/fluent/fluent-bit/blob/master/MAINTENANCE.md). diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index cbb4f465188..3927debabad 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -13,7 +13,7 @@ # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7,linux/s390x" -f ./dockerfiles/Dockerfile.multiarch --build-arg FLB_TARBALL=https://github.com/fluent/fluent-bit/archive/v1.8.11.tar.gz ./dockerfiles/ # Set this to the current release version: it gets done so as part of the release. -ARG RELEASE_VERSION=5.0.9 +ARG RELEASE_VERSION=5.1.0 # For multi-arch builds - assumption is running on an AMD64 host FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32 diff --git a/fluent-bit-5.0.9.bb b/fluent-bit-5.1.0.bb similarity index 99% rename from fluent-bit-5.0.9.bb rename to fluent-bit-5.1.0.bb index 816ba0e46a4..e822f9b4189 100644 --- a/fluent-bit-5.0.9.bb +++ b/fluent-bit-5.1.0.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" PR = "r0" -PV = "5.0.9" +PV = "5.1.0" SRCREV = "v${PV}" SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 907486313f5..c6e834eaa53 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: fluent-bit base: core20 -version: '5.0.9' +version: '5.1.0' summary: High performance logs and stream processor description: | Fluent Bit is a high performance log processor and stream processor for Linux.