upgrade to spring 4 + datasource changes