Fix maven classpath/dependency ordering issue