Update our JPA to latest guava