changs for hibernate search, spring upgrades etc