[DISCUSS] 2.1.x maintenance branch strategy

[Sandor Molnar <sm...@apache.org>]

Hi all,

I would like to start a discussion about the branching strategy for maintenance releases in the 2.1 line of Apache Knox.

## Proposal

Create a dedicated maintenance branch for the 2.1 release line:

* Create a **v2.1.x** branch from the released **v2.1.0** tag
* All fixes and improvements intended for 2.1.x should target **v2.1.x**
* Future patch releases (2.1.1, 2.1.2, …) would be cut, tested, and released from this branch
* Each release would still receive its own release tag

## Motivation

* Preserves **v2.1.0** as an immutable representation of the exact released version
* Avoids modifying a branch that users may rely on to rebuild the original release
* Provides a clear target for backports and maintenance work
* Aligns with practices used by several Apache projects (for example, support branches used by Apache NiFi)

## Context

There are already fixes pending (e.g., the pac4j OIDC federation issue) that affect 2.1.0 but are intended for a future maintenance release. Targeting v2.1.0 directly would effectively change the contents of that release branch.

Feedback, alternative approaches, and pointers to relevant ASF guidance would be greatly appreciated.

Best regards,
Sandor

Re: [DISCUSS] 2.1.x maintenance branch strategy

[larry mccay <lm...@apache.org>]

Hi Sandor -

Thanks for bringing this up.
I think this is a good strategy that aligns with other projects' approach
to the same thing.

+1

thanks,

--larry

On Wed, Feb 25, 2026 at 6:23 AM Sandeep Moré <mo...@gmail.com> wrote:

> Thank you Sandor for starting the discussion. I think this is a good idea
> to start a dedicated 2.1 release branch.
> I would also like to add that this will help folks who are on JDK 8 since
> 2.1 will (should) continue to support JDK 8 (as opposed to 3.0 which will
> *not
> *support JDK 8)
> We should also think about adding a link for 2.1.x release docs (User
> Guide) to knox.apache.org
>
> Thank you again!
> -sandeep
>
> On Wed, Feb 25, 2026 at 5:57 AM Sandor Molnar <sm...@apache.org> wrote:
>
> > Hi all,
> >
> > I would like to start a discussion about the branching strategy for
> > maintenance releases in the 2.1 line of Apache Knox.
> >
> > ## Proposal
> >
> > Create a dedicated maintenance branch for the 2.1 release line:
> >
> > * Create a **v2.1.x** branch from the released **v2.1.0** tag
> > * All fixes and improvements intended for 2.1.x should target **v2.1.x**
> > * Future patch releases (2.1.1, 2.1.2, …) would be cut, tested, and
> > released from this branch
> > * Each release would still receive its own release tag
> >
> > ## Motivation
> >
> > * Preserves **v2.1.0** as an immutable representation of the exact
> > released version
> > * Avoids modifying a branch that users may rely on to rebuild the
> original
> > release
> > * Provides a clear target for backports and maintenance work
> > * Aligns with practices used by several Apache projects (for example,
> > support branches used by Apache NiFi)
> >
> > ## Context
> >
> > There are already fixes pending (e.g., the pac4j OIDC federation issue)
> > that affect 2.1.0 but are intended for a future maintenance release.
> > Targeting v2.1.0 directly would effectively change the contents of that
> > release branch.
> >
> > Feedback, alternative approaches, and pointers to relevant ASF guidance
> > would be greatly appreciated.
> >
> > Best regards,
> > Sandor
> >
>

Re: [DISCUSS] 2.1.x maintenance branch strategy

[Sandeep Moré <mo...@gmail.com>]

Thank you Sandor for starting the discussion. I think this is a good idea
to start a dedicated 2.1 release branch.
I would also like to add that this will help folks who are on JDK 8 since
2.1 will (should) continue to support JDK 8 (as opposed to 3.0 which will *not
*support JDK 8)
We should also think about adding a link for 2.1.x release docs (User
Guide) to knox.apache.org

Thank you again!
-sandeep

On Wed, Feb 25, 2026 at 5:57 AM Sandor Molnar <sm...@apache.org> wrote:

> Hi all,
>
> I would like to start a discussion about the branching strategy for
> maintenance releases in the 2.1 line of Apache Knox.
>
> ## Proposal
>
> Create a dedicated maintenance branch for the 2.1 release line:
>
> * Create a **v2.1.x** branch from the released **v2.1.0** tag
> * All fixes and improvements intended for 2.1.x should target **v2.1.x**
> * Future patch releases (2.1.1, 2.1.2, …) would be cut, tested, and
> released from this branch
> * Each release would still receive its own release tag
>
> ## Motivation
>
> * Preserves **v2.1.0** as an immutable representation of the exact
> released version
> * Avoids modifying a branch that users may rely on to rebuild the original
> release
> * Provides a clear target for backports and maintenance work
> * Aligns with practices used by several Apache projects (for example,
> support branches used by Apache NiFi)
>
> ## Context
>
> There are already fixes pending (e.g., the pac4j OIDC federation issue)
> that affect 2.1.0 but are intended for a future maintenance release.
> Targeting v2.1.0 directly would effectively change the contents of that
> release branch.
>
> Feedback, alternative approaches, and pointers to relevant ASF guidance
> would be greatly appreciated.
>
> Best regards,
> Sandor
>