New try, after trying to fix all POMs