There were also some other layer-breaking dependencies from org.hibernate.criteria to org.hibernate.sqm. I’ve cleaned that up.