clean/improve maven and ant requirements, update #2243