Implement Criteria API to use with JPA queries
Replace criteria with QueryDSL
Distribute Spring context
Distribute maven dependency management