use hibernate 3.6.10.3 version
Merge branch '2.3.x'