From 8219facc760d9783bec175aee11f89b32a9578bd Mon Sep 17 00:00:00 2001
From: Matthias Sohn
Date: Fri, 11 Feb 2011 23:45:28 +0100
Subject: Fix version.sh

Also change sorting in org.eclipse.egit.ui.test/pom.xml to ease
finding versions to be changed by version.sh.

Change-Id: Ic7518ab2eb65d43c3bdba8f957e82e6700beb95f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.egit.ui.test/pom.xml | 14 +++++++-------
 tools/version.sh                 | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 16f0daca41..f2bab5e4fc 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -91,23 +91,23 @@
           <dependencies>
             <dependency>
               <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.pde.feature.group</artifactId>
-              <version>${platform-version}</version>
+              <artifactId>org.eclipse.egit.feature.group</artifactId>
+              <version>[0.11.0,0.12.0)</version>
             </dependency>
             <dependency>
               <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.egit.feature.group</artifactId>
+              <artifactId>org.eclipse.jgit.feature.group</artifactId>
               <version>[0.11.0,0.12.0)</version>
             </dependency>
             <dependency>
               <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.cvs.feature.group</artifactId>
-              <version>[1.1.2,2.0.0)</version>
+              <artifactId>org.eclipse.pde.feature.group</artifactId>
+              <version>${platform-version}</version>
             </dependency>
             <dependency>
               <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.jgit.feature.group</artifactId>
-              <version>[0.11.0,0.12.0)</version>
+              <artifactId>org.eclipse.cvs.feature.group</artifactId>
+              <version>[1.1.2,2.0.0)</version>
             </dependency>
            </dependencies>
         </configuration>
diff --git a/tools/version.sh b/tools/version.sh
index e97a2b7472..e373d72615 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -108,6 +108,20 @@ perl -pi~ -e '
 	s/(org.eclipse.jgit.*;version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/;
 	' $(git ls-files | grep META-INF/MANIFEST.MF)
 
+perl -pi~ -e '
+	if ($ARGV ne $old_argv) {
+		$seen_version = 0;
+		$old_argv = $ARGV;
+	}
+	if ($seen_version < 4) {
+		$seen_version++ if (!/<\?xml/ &&
+		s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
+	}
+	s/(feature="org.eclipse.egit.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
+	s/(feature="org.eclipse.egit.ui" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
+	s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
+	' org.eclipse.egit.mylyn-feature/feature.xml
+
 perl -pi~ -e '
 	if ($ARGV ne $old_argv) {
 		$seen_version = 0;
@@ -118,12 +132,24 @@ perl -pi~ -e '
 		s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
 	}
 	s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
-	' org.eclipse.egit-feature/feature.xml
+	' $(git ls-files | grep feature.xml)
 
 perl -pi~ -e '
 	s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
 	' org.eclipse.egit-feature/pom.xml
 
+perl -pi~ -e '
+	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}>};
+	}
+	s{<(egit-version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+	' pom.xml
+	
 perl -pi~ -e '
 	if ($ARGV ne $old_argv) {
 		$seen_version = 0;
@@ -135,6 +161,17 @@ perl -pi~ -e '
 	}
 	' org.eclipse.egit-updatesite/pom.xml
 
+perl -pi~ -e '
+	if ($ARGV ne $old_argv) {
+		$seen_version = 0;
+		$old_argv = $ARGV;
+	}
+	if ($seen_version < 3) {
+		$seen_version++ if
+		s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+	}
+	' org.eclipse.egit.ui.test/pom.xml
+
 perl -pi~ -e '
 	if ($ARGV ne $old_argv) {
 		$seen_version = 0;
-- 
cgit v1.2.3