test dependency is now test only
Merge remote-tracking branch 'java/master'