Revert "make sure maven does not try to cache update attempts too much"

This reverts commit 82867c893d36feabdfade0f78e6d22329d0b0367.
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Merge branch 'master' into pull-requests