update pom.xml
merge conflicts
[maven-release-plugin] prepare release disable-failed-job-1.5