Increasing Java version to 1.7 and overriding aspectj dependencies from build-parent