6 commits - java/buildconf java/code