Fix recent build failures due to changes in bundles in maven central.