Locally, the changes I posted to OPENJPA-2645 allow my maven build to complete successfully. By in large, most of the changes have been poached from trunk, though I had to force the use of newer maven plugins on some occasions (such as maven-assembly-plugin). Does anyone have any objections to the proposed patch?
Patch can be tested by applying, and then executing at the branch root: mvn -U clean site install -DskipTests -Pjavadoc-profile,docbook-profile
