On Tue, May 18, 2021 at 1:34 PM Mark Thomas <ma...@apache.org> wrote:
> All, > > Things are starting to move forward for Jakarta EE 10 so I think it is > time for us to create the 10.1.x branch. At the same time, I'd like to > switch our primary development branches from master to main for all our > repos. > Ah good news. I sort of wasn't expecting anything anymore ;) > > We would, therefore, end up with the following for the Tomcat repo: > > main - 10.1.x development > 10.0.x - 10.0.x development/maintenance > 9.0.x - 9.0.x development/maintenance > 8.5.x - 8.5.x development/maintenance > 7.0.x - 7.0.x development/maintenance > +1 > > There are some git commands each committer will need to run locally for > each repo to switch from master to main. > > I have also been looking into how we can "retire" the 7.0.x branch when > the time comes (after end of June). I'd like to suggest the following: > - tag the HEAD of the 7.0.x branch as "7.0.x-archive" > - delete the 7.0.x branch > > That way it won't appear in the list of branches but it is trivial to > recreate if we need it. > Good idea ! > > I'd like to get the master->main rename completed and the 10.1.x > development branch created towards the end of this week (unless there > are objections or things we need to discuss further). > > Comments? > Rémy > > Mark > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
