Reformat pom and pick up credentials 1.16.1