Yes, I think Aled's right. The `0.9.x` branch is for all releases made from 0.9.0-SNAPSHOT, and they should be identified by tags on the commits for particular release versions. So development continues on master and we pull in the required hotfix and patch commits to 0.9.x from there. Same model should be used for future releases (i.e. 0.10.0) as well.
I think the jclouds model is reasonable to imitate, but I _am_ curious if there are other Java based Apache projects that work differently. What does e.g. Karaf do? Answer - they use the same model as jclouds, just different naming convention for branches and tags. Are there any different models? Andrew. On Tue, 26 Apr 2016 at 21:16 Aled Sage <aled.s...@gmail.com> wrote: > Hi Richard, > > I used the head of the 0.9.0 branch in each repo, which I have just > confirmed is the identical commit to `rel/apache-brooklyn-0.9.0` for all > of the repos except brooklyn-docs. > > For brooklyn-docs, the release tag is git commit 12430d1 [1], but the > 0.9.0 had a number of additional commits on top of that which are > included in 0.9.x [2]. > > --- > > We should document this properly (you're right that we should have used > the release tag). > > In fact, for next time I'd be in favour of us creating a 0.10.x branch > (and no 0.10.0 branch). We would release 0.10.0 from that branch, and > then commit to the 0.10.x branch to change the version to 0.10.1-SNAPSHOT. > > That is the model used by Apache jclouds, for example. > > Aled > > [1] > > https://github.com/apache/brooklyn-docs/releases/tag/rel%2Fapache-brooklyn-0.9.0 > [2] https://github.com/apache/brooklyn-docs/commits/0.9.x > > > On 26/04/2016 13:27, Richard Downer wrote: > > Hi Aled, > > > > What did you use as the base for the branch? The > > `rel/apache-brooklyn-0.9.0` tag or something else? > > > > Richard. > > > > On 26 April 2016 at 13:17, Aled Sage <aled.s...@gmail.com> wrote: > > > >> Hi all, > >> > >> I've created a 0.9.x branch (at version 0.9.1-SNAPSHOT) for fixes that > >> we'd want in a 0.9.1 release. I don't think there is anything serious > >> enough to warrant diong a 0.9.1 release quite yet though. > >> > >> Aled > >> > >> > > -- Andrew Kennedy ; Founder clocker.io project ; @grkvlt ; Cloudsoft
