Fix JPA jar variant generation dependency clean up - also elsewhere