java added to artifact-id
Merge branch 'v1' into v2