Update spring to latest stable (4.0.3). Drop now not needed custom db builder.