hamcrest and junit update