migrate to servet 3.1