Hi, we've finally released Carrot2 3.5.0, so I'm attaching the patch (git) against Solr trunk for your review. The patch contains several separate commits related to the upgrade (SOLR-2448, SOLR-2449, SOLR-2450, SOLR-2505), I hope it will be easier to review this way.
One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch). Let me know if I need to update the dependencies/version numbers anywhere.
The patch for Solr 3.x is in the works, we need to release JDK1.5-compatible version of some of the dependencies (HPPC) to make it happen.
Oh, is there any way to assign this issue to myself? It looks like I don't have this permission now.