Update manifests to use versioned Import-Package or Require-Bundle

Rather than taking anything at random, take the >= 3.4 but less
than 4.0 versions for any Eclipse package, and JGit 0.6.0,0.7.0.
This documents the assumption we are making about targeting the
3.4 API platform for Eclipse, but hopefully working on a forward
release up until 4.0.

Change-Id: If3955b243dbd36b6bee63472fa480ac172a80354
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

5 files changed, 92 insertions, 67 deletions

diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index 89b6d6f6a5..30fd126e19 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -24,21 +24,21 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.4" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.team.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.net"/>
-      <import plugin="org.eclipse.team.core" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jsch.core"/>
-      <import plugin="com.jcraft.jsch"/>
-      <import feature="org.eclipse.jgit" version="0.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.4" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.team.ui" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.compare" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.net" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.team.core" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/>
+      <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/>
+      <import plugin="com.jcraft.jsch" version="0.1.41" match="compatible"/>
+      <import feature="org.eclipse.jgit" version="0.6.0" match="equivalent"/>
    </requires>
 
    <plugin
@@ -61,5 +61,4 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index 438bed4f56..2eb3311881 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -1,21 +1,24 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in (Incubation)
+Bundle-Name: Git Team Provider Core Test Plug-in (Incubation)
+Bundle-Vendor: Eclipse.org
 Bundle-SymbolicName: org.eclipse.egit.core.test
 Bundle-Version: 0.6.0.qualifier
 Bundle-Activator: org.eclipse.egit.core.test.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.team.core,
- org.junit,
- org.eclipse.egit.core,
- org.eclipse.egit.ui,
- org.eclipse.jgit,
- org.eclipse.core.filesystem,
- org.eclipse.jgit.junit;bundle-version="0.6.0"
+Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;version="[3.4.0,4.0.0)",
+ org.eclipse.team.core;version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.launching;version="[3.4.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jdt.junit,
- org.eclipse.jdt.launching
-Export-Package: org.eclipse.egit.core.internal.mapping
+Import-Package: junit.framework;version="[4.3.1,5.0.0)",
+ org.eclipse.egit.core;version="[0.6.0,0.7.0)",
+ org.eclipse.egit.core.op;version="[0.6.0,0.7.0)",
+ org.eclipse.egit.core.project;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.junit;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.treewalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util;version="[0.6.0,0.7.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
index beae864170..efd21183f3 100644
--- a/org.eclipse.egit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -6,16 +6,23 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Activator: org.eclipse.egit.core.Activator
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.team.core,
- org.eclipse.core.resources,
- org.eclipse.jgit,
- org.eclipse.core.filesystem,
- org.eclipse.ui
-Export-Package: org.eclipse.egit.core,
- org.eclipse.egit.core.internal.storage;x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.util;x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.op,
- org.eclipse.egit.core.project
+Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
+ org.eclipse.team.core;version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;version="[3.4.0,4.0.0)",
+ org.eclipse.ui;version="[3.4.0,4.0.0)"
+Export-Package: org.eclipse.egit.core;version="0.6.0",
+ org.eclipse.egit.core.internal.storage;version="0.6.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.util;version="0.6.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.op;version="0.6.0",
+ org.eclipse.egit.core.project;version="0.6.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.jgit.dircache;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.errors;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.transport;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.treewalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util;version="[0.6.0,0.7.0)"
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index b1ea8fa1bb..20aca82459 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -1,16 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
+Bundle-Name: Git Team Provider UI Test Plug-in (Incubation)
+Bundle-Vendor: Eclipse.org
 Bundle-SymbolicName: org.eclipse.egit.ui.test
 Bundle-Version: 0.6.0.qualifier
 Bundle-Activator: org.eclipse.egit.ui.test.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;version="[3.4.0,4.0.0)"
 Import-Package: org.apache.log4j,
- org.eclipse.core.resources,
- org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.core.runtime.jobs,
- org.eclipse.jgit.lib;version="0.6.0",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
  org.eclipse.swt.widgets,
  org.eclipse.swtbot.eclipse.finder,
  org.eclipse.swtbot.eclipse.finder.exceptions,
@@ -27,7 +28,7 @@ Import-Package: org.apache.log4j,
  org.eclipse.swtbot.swt.finder.widgets,
  org.eclipse.ui,
  org.hamcrest,
- org.junit;version="4.3.1",
- org.junit.runner;version="4.3.1",
- org.junit.runners;version="4.3.1",
- org.osgi.framework;version="1.4.0"
+ org.junit;version="[4.3.1,5.0.0)",
+ org.junit.runner;version="[4.3.1,5.0.0)",
+ org.junit.runners;version="[4.3.1,5.0.0)",
+ org.osgi.framework;version="[1.4.0,2.0.0)"
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index ac0db7dd04..3035d3bf88 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -6,23 +6,38 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Activator: org.eclipse.egit.ui.Activator
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.filesystem,
- org.eclipse.core.net,
- org.eclipse.ui,
+Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;version="[3.4.0,4.0.0)",
+ org.eclipse.core.net;version="[3.4.0,4.0.0)",
+ org.eclipse.ui;version="[3.4.0,4.0.0)",
  org.eclipse.team.core;bundle-version="3.4.0",
- org.eclipse.team.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.compare,
- org.eclipse.jgit,
- org.eclipse.egit.core,
- org.eclipse.ui.ide,
- org.eclipse.jsch.ui;bundle-version="1.1.100"
+ org.eclipse.team.ui;version="[3.4.0,4.0.0)",
+ org.eclipse.jface.text;version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;version="[3.4.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;version="[3.4.0,4.0.0)",
+ org.eclipse.compare;version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;version="[3.4.0,4.0.0)",
+ org.eclipse.jsch.ui;bundle-version="1.1.100",
+ org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch,
- org.eclipse.jsch.core,
- org.eclipse.jsch.internal.core
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
+ org.eclipse.egit.core;version="[0.6.0,0.7.0)",
+ org.eclipse.egit.core.op;version="[0.6.0,0.7.0)",
+ org.eclipse.egit.core.project;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.diff;version="0.6.0",
+ org.eclipse.jgit.dircache;version="0.6.0",
+ org.eclipse.jgit.errors;version="0.6.0",
+ org.eclipse.jgit.fnmatch;version="0.6.0",
+ org.eclipse.jgit.lib;version="0.6.0",
+ org.eclipse.jgit.merge;version="0.6.0",
+ org.eclipse.jgit.patch;version="0.6.0",
+ org.eclipse.jgit.revplot;version="0.6.0",
+ org.eclipse.jgit.revwalk;version="0.6.0",
+ org.eclipse.jgit.revwalk.filter;version="0.6.0",
+ org.eclipse.jgit.transport;version="0.6.0",
+ org.eclipse.jgit.treewalk;version="0.6.0",
+ org.eclipse.jgit.treewalk.filter;version="0.6.0",
+ org.eclipse.jgit.util;version="0.6.0",
+ org.eclipse.jgit.util.io;version="0.6.0"