cleanup import

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1552160 13f79535-47bb-0310-9956-ffa450edef68
use fest assert

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1552161 13f79535-47bb-0310-9956-ffa450edef68