Remove unused Mockito dependency
Use latest release of Geronimo Java EE APIs