The branch is now merged into trunk.
In the process I have separated out the JCR dependencies from the main build so that you dont have to have a) JCR running in trunk/2.5.
In the base pom.xml for content there are 2 new projects content-impl-jrc/impl and content-impl-jrc/pack
impl builds the JCR extension jar that provides JCR storage and depends on the sakai jcr api.
pack is an alternative pack to the standard DB CHS pack. This pack contains both the DB CHS and the JCR CHS
For the moment, we will build the impl but not peform the pack so the JCR jar will not appear in the running Sakai.
As we migrate we will continue to build the DB CHS (and the JCR CHS jar) but will move to the jcr pack.
There is no need to change what is checked out, since build configuration is now all done with the pom.xml and not as a result of the code being present on disk.