hibernate files with updated pom
resolve conflict