GRADLEREV-15 - use a convention mapping and add @Incubating.