Use junit-dep, not junit
Switch from junit-dep to junit
Remove direct dependency on junit