further upgraded to maven and cayenne 3.1