Update hibernate + search. Fix deprecation notice
Fix another deprecation notice, put modelgen-jar back on general classpath