More build fixes for Maven 3.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@944774 13f79535-47bb-0310-9956-ffa450edef68
18 files changed