I have cherry picked the java changes out of 5.4 hibernate PR https://github.com/lucee/extension-hibernate/pull/37