Migrating to Eclipse 4.21 from 4.20