Finish spring AOP schema-base exercise.
(cherry picked from commit aed4ff0)