changed pom
this commit should be deleted
fixed merge failure
prepared pom
[maven-release-plugin] prepare release release-test-repo-7.0.0
[maven-release-plugin] prepare for next development iteration