Cleaning up tomcat tasks so that they have explicit dependencies