trunk is now for 2.2 development

From: Edward Burns <>
Date: Sat, 12 Feb 2011 22:34:07 -0500

Now that we have management approval for doing JSF 2.2, the trunk is now
designated for development on that line.

The MOJARRA_2_1X_ROLLING branch will be used for continuing RI work,
currently the 2.1.1 release.

We are planning to continue to do 2.1 releases about every other month
so bug fixes will need to be contributed both to trunk and the

This means all of us must become very adept at merging. Too bad we're
not using git.