support/general no longer depends on hibernate-jpa