Fix version.sh to not overwrite ${project.version}

Change-Id: If5ae792581170bcba2dc1860012cbe389d8e9f24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/tools/version.sh b/tools/version.sh
index eaff9a61d829ec80f4ef397ac8f6230b9177f5cb..52a02c59f7029a63c19d03b5b7641199ec03d97c 100755 (executable)
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -133,7 +133,14 @@ perl -pi~ -e '
        ' org.eclipse.jgit.packaging/org.*.feature/feature.xml
 
 perl -pi~ -e '
-       s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
+       if ($ARGV ne $old_argv) {
+               $seen_version = 0;
+               $old_argv = $ARGV;
+       }
+       if (!$seen_version) {
+               $seen_version = 1 if
+               s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
+       }
        ' org.eclipse.jgit.packaging/org.*.feature/pom.xml
 
 perl -pi~ -e '
@@ -152,8 +159,8 @@ perl -pi~ -e '
                $seen_version = 0;
                $old_argv = $ARGV;
        }
-       if ($seen_version < 2) {
-               $seen_version++ if
+       if (!$seen_version) {
+               $seen_version = 1 if
                s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
        }
        ' org.eclipse.jgit.packaging/pom.xml