updated maven versions
manuel merge of master pom