Currently work is on going in 1.7.x, that's 1.7.2-SNAPSHOT and trunk, that's 2.0.0-SNAPSHOT.
Don't get to hung up on it as we're in the process of moving to git. The 1.7.x is really just for maintenance. The trunk is gradually moving away from it, so fix bugs in 1.7.x and trial merges to trunk. But expect issues - not too bad at the moment. If a feature dev occurs in trunk then a backport is manual, as trunk is now Java 7, with all Lang usage. BUT ONLY after discussion. We generally do not have plans to backport features.. Trunk is EE7, everything else EE6. Andy On 3 Oct 2014 06:53, "Daniel Kasmeroglu" <[email protected]> wrote: > What is the general branching strategy for Tomee ? > > 1) Regular development within a branch and then a merge into trunk ? > 2) Regular development within trunk and backport to maintained branches ? > > How is this process managed for OpenEJB/Tomee ? > > > Best regards > > Daniel Kasmeroglu >
