Use maven-plugin-annotations, fix a few warnings + indentation
Partially revert "Simplify ClasspathBuilder#buildClasspathList a bit."

This partially reverts commit 576e15e4537d1405c84c06a03610ee60b7dc66ba.