upgrade to spring 4.0.4 and aspectj 1.8.0