Relax JGit/EGit dependencies to allow versions in range [3.2,4.0)

Change version.sh to no longer flip versions of JGit and EGit
dependencies. They are now set to [3.2.0,4.0.0) and have to be
maintained manually from now on.

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

4 files changed, 28 insertions, 54 deletions

diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml
index 9f7a1b65..f61bce7c 100644
--- a/org.eclipse.mylyn.github-feature/feature.xml
+++ b/org.eclipse.mylyn.github-feature/feature.xml
@@ -19,6 +19,7 @@
    </license>
 
    <requires>
+      <import feature="org.eclipse.egit" version="3.2.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="com.google.gson" version="1.6" match="greaterOrEqual"/>
    </requires>
diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
index 7974b369..86e5681d 100644
--- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.1";x-friends
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)"
-Import-Package: org.eclipse.egit.core;version="[3.6.1,3.7.0)",
+Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)",
  org.eclipse.egit.github.core;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.client;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.service;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.util;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.lib;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.transport;version="[3.6.1,3.7.0)"
+ org.eclipse.jgit.lib;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.transport;version="[3.2.0,4.0.0)"
diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
index 14ca9f5b..fa528596 100644
--- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
@@ -27,26 +27,26 @@ Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.1";x-internal:
  org.eclipse.mylyn.internal.github.ui.gist;version="3.6.1";x-internal:=true,
  org.eclipse.mylyn.internal.github.ui.issue;version="3.6.1";x-internal:=true
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.egit.core;version="[3.6.1,3.7.0)",
- org.eclipse.egit.core.op;version="[3.6.1,3.7.0)",
+Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.core.op;version="[3.2.0,4.0.0)",
  org.eclipse.egit.github.core;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.client;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.service;version="[3.6.1,3.7.0)",
  org.eclipse.egit.github.core.util;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.branch;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.commit;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.components;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.fetch;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.provisional.wizards;version="[3.6.1,3.7.0)",
- org.eclipse.egit.ui.internal.pull;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.errors;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.lib;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.transport;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)",
+ org.eclipse.egit.ui;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.branch;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.commit;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.components;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.fetch;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.provisional.wizards;version="[3.2.0,4.0.0)",
+ org.eclipse.egit.ui.internal.pull;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.errors;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.lib;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.revwalk;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.transport;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.treewalk;version="[3.2.0,4.0.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.2.0,4.0.0)",
  org.eclipse.mylyn.internal.github.core;version="[3.6.1,3.7.0)",
  org.eclipse.mylyn.internal.github.core.gist;version="[3.6.1,3.7.0)",
  org.eclipse.mylyn.internal.github.core.issue;version="[3.6.1,3.7.0)",
diff --git a/tools/version.sh b/tools/version.sh
index 27eac1dd..f679df37 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -38,13 +38,8 @@ case "$1" in
 	shift
 	;;
 
---jgit=*)
-	J=${1##--jgit=}
-	shift
-	;;
-
 *)
-	echo >&2 "usage: $0 {--snapshot=0.n.0 | --release} [--jgit=0.n.0]"
+	echo >&2 "usage: $0 {--snapshot=0.n.0 | --release}"
 	exit 1
 esac
 done
@@ -95,20 +90,13 @@ next_version() {
 		' "$1"
 }
 
-EGIT_V=$(to_version "$V")
-EGIT_N=$(next_version "$EGIT_V")
-
-[ -z "$J" ] && J=$V
-JGIT_V=$(to_version "$J")
-JGIT_N=$(next_version "$JGIT_V")
+GITHUB_V=$(to_version "$V")
+GITHUB_N=$(next_version "$GITHUB_V")
 
 perl -pi~ -e '
 	s/^(Bundle-Version:\s*).*$/${1}'"$OSGI_V"'/;
-	s/(org.eclipse.egit.*;version=")[^"[(]*(")/${1}'"$EGIT_V"'${2}/;
-	s/(org.eclipse.egit.*;version="\[)[^"]*(\)")/${1}'"$EGIT_V,$EGIT_N"'${2}/;
-	s/(org.eclipse.mylyn.internal.github.*;version=")[^"[(]*(")/${1}'"$EGIT_V"'${2}/;
-	s/(org.eclipse.mylyn.internal.github.*;version="\[)[^"]*(\)")/${1}'"$EGIT_V,$EGIT_N"'${2}/;
-	s/(org.eclipse.jgit.*;version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/;
+	s/(org.eclipse.mylyn.internal.github.*;version=")[^"[(]*(")/${1}'"$GITHUB_V"'${2}/;
+	s/(org.eclipse.mylyn.internal.github.*;version="\[)[^"]*(\)")/${1}'"$GITHUB_V,$GITHUB_N"'${2}/;
 	' $(git ls-files | egrep "META-INF/MANIFEST.MF|META-INF/SOURCE-MANIFEST.MF")
 
 perl -pi~ -e '
@@ -116,27 +104,13 @@ perl -pi~ -e '
 		$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.github.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
-	s/(feature="org.eclipse.mylyn.github.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/;
-	s/(feature="org.eclipse.mylyn.github.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;
-		$old_argv = $ARGV;
-	}
 	if (!$seen_version) {
 		$seen_version = 1 if (!/<\?xml/ &&
 		s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
 	}
-	s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/;
-	' $(git ls-files | grep feature.xml)
+	s/(feature="org.eclipse.mylyn.github.core" version=")[^"]*(")/${1}'"$GITHUB_V"'${2}/;
+	s/(feature="org.eclipse.mylyn.github.ui" version=")[^"]*(")/${1}'"$GITHUB_V"'${2}/;
+	' org.eclipse.mylyn.github-feature/feature.xml
 
 perl -pi~ -e '
 	s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
@@ -174,7 +148,6 @@ perl -pi~ -e '
 		$seen_version = 1 if
 		s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
 	}
-	s{<(jgit-version)>[^<]*</\1>}{<${1}>'"$J"'</${1}>};
 	' $(git ls-files | grep pom.*.xml)
 
 find . -name '*~' | xargs rm -f