Merge pull request #306 from bmarwell/aspectj-maven-plugin

[SHIRO-822] Update aspectj-maven-plugin.