updating poms for 1.0.1-SNAPSHOT development
Resolve merge conflict
Resolve merge conflict
updating poms for branch '1.0.0' with snapshot versions
updating poms for branch'release-1.0.0' with non-snapshot versions
Merge branch 'release-1.0.0'