Merge "Do not override jsr305 version"