I've started this upgrade in https://github.com/lfryc/aerogear-unifiedpush-server/tree/javaee7

but one test is failing.