CM upgrade aspectjweaver for spring-aspects