I think you are doing it correct. ZK is in a good position in that it doesn't have that many branches to maintain: 3.4, 3.5, 3.6, and now 3.7.
How long do you want to continue the 3.4 branch, or is it already EoL? Thanks. On Wed, Jan 22, 2020, 5:59 AM Andor Molnar <[email protected]> wrote: > Hi, > > We started a discussion on Slack about branching/not branching for new > releases like branch-3.5.6, branch-3.6.0, etc. I noticed that Enrico has > not created branch for 3.6.0 and I’d like to talk about the motivations. > > Personally I’ve found the separate branch useful in the release process, > because I didn’t have to ask people not to submit new patches on branch-3.5 > due to ongoing release process. On the flipside, fixes which have come up > during release validation had to be submitted for 2 branches: branch-3.5 > and branch-3.5.X. > > Either way I would keep our current branching strategy, but also would > like to hear everybody’s opinion. > > Regards, > Andor > > > > > > On 2019. Nov 11., at 22:19, Enrico Olivelli <[email protected]> wrote: > > > > Hello, > > in 3.5 we did a great work (in particular Andor and Norbert) in order to > > mavenize our repository and current we are performing releases from 3.5 > > branch with Maven. > > > > For 3.6.0 I would like to try to enhance the procedure a bit and make it > > simpler, by using the Maven Release Plugin [1]. > > > > I am drafting a new procedure [2], but it is still not ready, > > Once I am done with it the procedure will look like this [3] or [4] > > > > The major problem with the Maven release plugin is to update the versions > > on the C client, but I have found some trick so I am doing tests. > > > > I am just waiting for pending PRs that have been said to be nice to have > on > > 3.6.0 to land to master then I am confident we are ready to cut a release > > > > Any comments and help are welcome > > > > Enrico > > > > [1] https://maven.apache.org/maven-release/maven-release-plugin/ > > [2] > > > https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=135860428 > > [3] > https://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven > > [4] https://github.com/diennea/herddb/wiki/Release-guide > >
