So yes, Java5 migration would have an additional cost of making supporting the two branches more difficult. It depends how different the 2 code base will be actually. If they differ a lot, then there will be already a cost. The cost to fix both issues at the same time is not that high. What would be high is to fix an issue in trunk and backport it later without thinking about the the 2.6 branch. View the original post : http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4060889#... Reply to the post : http://www.jboss.com/index.html?module=bb&op=posting&mode=reply&a...