Yes this is a good approach. As you said, we should periodically merge master into release/7.0. Rebasing will become cumbersome the longer the branch lives on. We could probably even automate this with a GitHub action.
On Sun, 8 Oct 2023 at 21:58, Lukasz Lenart <lukaszlen...@apache.org> wrote: > Hi, > > It's time to start planning work on Struts 7.x. I think all the main > blockers have been addressed, and we should be able to implement > Struts 7 using JDK 17 and JakartaEE. > However, we should still keep working on Struts 6.4.0 and support > Struts 2.5.x for at least another 6 months (in case of security > vulnerabilities). > > I thought to do that a bit differently this time. We should continue > working on Struts 6.4.0 using the "master" branch, and create an > additional "release/struts-7.x.x" branch to start working on Struts 7. > The branch can be easily rebased on the master branch and finally > merged into it once we finish working on Struts 6.4.0. > > wdyt? > > > Regards > -- > Łukasz > + 48 606 323 122 > https://urldefense.proofpoint.com/v2/url?u=http-3A__www.lenart.org.pl_&d=DwIFaQ&c=wBUwXtM9sKhff6UeHOQgv4fd18fdhJxC4AsYDNghVWA&r=zioHoPGtJ3ATpud04m0k8eJTQnjJdFOZm1u3X79KG3s&m=JsRqdof2_2D4NLOeFCDJVL_nkybau25FogtTjDpwFjPfDtBQNuBv_5rDk8mJLvKY&s=L_bBQZPj9X7ew4I6S02L1yDIdyBaoFRiAegg03H89Sg&e= > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org > For additional commands, e-mail: dev-h...@struts.apache.org > >
