Consistent aspectj version throughout
The build now uses spring build conventions to simplify the build Fixes gh-4284