- Roll-batcked to non-XA config
 - Fixed setup in non-XA config
 - Added dependency management for Eclipse-link and Open-JPA