Cleanup based on gradle:6-jdk11 image

1 job for v2.1-dev in 1 minute (queued for 3 seconds)