Gail Badner, I'm not sure of the state of your current Envers work, but I'm temporarily disabling the tests in hibernate-envers.gradle. After merging my unified-xml work, the xml/jaxb use needs work.