Cleanup OSGi Import-Package specifications to use versions

Actually set the range of versions we are willing to accept for
each package we import, lest we import something in the future
that isn't compatible with our needs.

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

diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
index ed12693f0c8a7028f27d7189a73c52b87f07f528..1b9d677fef38422a69aaa68f22986ee8fb9f4f03 100644 (file)
--- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.jgit.console;version="0.6.0"
-Import-Package: com.jcraft.jsch;version="0.1.41",
- org.eclipse.jgit.transport;version="0.6.0",
- org.eclipse.jgit.util
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
+ org.eclipse.jgit.transport;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util;version="[0.6.0,0.7.0)"

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 92b02e87654d4aaa6a3819c238f1cb0194afa626..2905a013e75eff4e0544b764899a0761d0140e9b 100644 (file)
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  javax.servlet.http;version="[2.5.0,3.0.0)",
- org.eclipse.jgit.errors;version="0.6.0",
- org.eclipse.jgit.lib;version="0.6.0",
- org.eclipse.jgit.revwalk;version="0.6.0",
- org.eclipse.jgit.transport;version="0.6.0",
- org.eclipse.jgit.util;version="0.6.0",
- org.eclipse.jgit.util.io;version="0.6.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.util;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util.io;version="[0.6.0,0.7.0)"

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 1481391f52f8820c5795da79f3f7bfb05bfd0618..9e6e77aab18157536448232ae46a6a971fe46d27 100644 (file)
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -6,28 +6,28 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- junit.framework;version="3.8.2",
- org.eclipse.jetty.continuation;version="7.0.1",
- org.eclipse.jetty.http;version="7.0.1",
- org.eclipse.jetty.http.security;version="7.0.1",
- org.eclipse.jetty.io;version="7.0.1",
- org.eclipse.jetty.security;version="7.0.1",
- org.eclipse.jetty.security.authentication;version="7.0.1",
- org.eclipse.jetty.server;version="7.0.1",
- org.eclipse.jetty.server.handler;version="7.0.1",
- org.eclipse.jetty.server.nio;version="7.0.1",
- org.eclipse.jetty.servlet;version="7.0.1",
- org.eclipse.jetty.util.component;version="7.0.1",
- org.eclipse.jetty.util.log;version="7.0.1",
- org.eclipse.jetty.util.thread;version="7.0.1",
- org.eclipse.jgit.errors;version="0.6.0",
- org.eclipse.jgit.http.server;version="0.6.0",
- org.eclipse.jgit.http.server.glue;version="0.6.0",
- org.eclipse.jgit.http.server.resolver;version="0.6.0",
- org.eclipse.jgit.junit;version="0.6.0",
- org.eclipse.jgit.lib;version="0.6.0",
- org.eclipse.jgit.revwalk;version="0.6.0",
- org.eclipse.jgit.transport;version="0.6.0",
- org.eclipse.jgit.util;version="0.6.0"
+Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
+ javax.servlet.http;version="[2.5.0,3.0.0)",
+ junit.framework;version="[3.8.2,4.0.0)",
+ org.eclipse.jetty.continuation;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.http;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.http.security;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.io;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.security;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.security.authentication;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.server;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.server.handler;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.server.nio;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.servlet;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.util.component;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.util.log;version="[7.0.1,8.0.0)",
+ org.eclipse.jetty.util.thread;version="[7.0.1,8.0.0)",
+ org.eclipse.jgit.errors;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.http.server;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.http.server.glue;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.http.server.resolver;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.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.transport;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util;version="[0.6.0,0.7.0)"

diff --git a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
index 41a70f87db4bf11b23eb7b62bc5952cfbc6781f1..9533cf8756dd1a28a1ac5d44db96933e35143423 100644 (file)
--- a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
@@ -7,15 +7,15 @@ Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: 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.lib;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"
-Export-package: org.eclipse.jgit.iplog;version="0.6.0"
+Import-Package: org.eclipse.jgit.diff;version="[0.6.0,0.7.0)",
+ 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.revplot;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk.filter;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)"
+Export-Package: org.eclipse.jgit.iplog;version="0.6.0"

diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 0ff1c0f96a9e1c2319df7148e08c9acff0fa6876..b2a519534f10e71edc70c85d509d197749c1beac 100644 (file)
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -7,21 +7,21 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch,
- junit.framework,
- org.eclipse.jgit.diff,
- org.eclipse.jgit.dircache,
- org.eclipse.jgit.errors,
- org.eclipse.jgit.fnmatch,
- org.eclipse.jgit.lib,
- org.eclipse.jgit.merge,
- org.eclipse.jgit.patch,
- org.eclipse.jgit.revplot,
- org.eclipse.jgit.revwalk,
- org.eclipse.jgit.revwalk.filter,
- org.eclipse.jgit.transport,
- org.eclipse.jgit.treewalk,
- org.eclipse.jgit.treewalk.filter,
- org.eclipse.jgit.util,
- org.eclipse.jgit.util.io
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
+ junit.framework;version="[3.8.2,4.0.0)",
+ org.eclipse.jgit.diff;version="[0.6.0,0.7.0)",
+ 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.fnmatch;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.merge;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.patch;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revplot;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk.filter;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)",
+ org.eclipse.jgit.util.io;version="[0.6.0,0.7.0)"
 Export-Package: org.eclipse.jgit.junit;version="0.6.0"

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index d69f14a73d9ba50e2b19cf71a47ba727f8a1d3d4..d80cf15009681c44b3d65a9ec3ea3903deba202e 100644 (file)
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -6,21 +6,21 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.awtui,
- org.eclipse.jgit.diff,
- org.eclipse.jgit.dircache,
- org.eclipse.jgit.errors,
- org.eclipse.jgit.lib,
- org.eclipse.jgit.revplot,
- org.eclipse.jgit.revwalk,
- org.eclipse.jgit.revwalk.filter,
- org.eclipse.jgit.transport,
- org.eclipse.jgit.treewalk,
- org.eclipse.jgit.treewalk.filter,
- org.eclipse.jgit.util,
- org.eclipse.jgit.iplog,
- org.kohsuke.args4j,
- org.kohsuke.args4j.spi
+Import-Package: org.eclipse.jgit.awtui;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.diff;version="[0.6.0,0.7.0)",
+ 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.revplot;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk.filter;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)",
+ org.eclipse.jgit.iplog;version="[0.6.0,0.7.0)",
+ org.kohsuke.args4j;version="[2.0.12,2.1.0)",
+ org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.jgit.pgm
 Main-Class: org.eclipse.jgit.pgm.Main

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 32d5efdfc457bbeb9f8a5d7ef911f7f37a87c229..47b028066d36a56d06b107e9a8b9eca028ba94d9 100644 (file)
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -7,22 +7,22 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch,
- junit.framework,
- junit.textui,
- org.eclipse.jgit.junit,
- org.eclipse.jgit.diff,
- org.eclipse.jgit.dircache,
- org.eclipse.jgit.errors,
- org.eclipse.jgit.fnmatch,
- org.eclipse.jgit.lib,
- org.eclipse.jgit.merge,
- org.eclipse.jgit.patch,
- org.eclipse.jgit.revplot,
- org.eclipse.jgit.revwalk,
- org.eclipse.jgit.revwalk.filter,
- org.eclipse.jgit.transport,
- org.eclipse.jgit.treewalk,
- org.eclipse.jgit.treewalk.filter,
- org.eclipse.jgit.util,
- org.eclipse.jgit.util.io
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
+ junit.framework;version="[3.8.2,4.0.0)",
+ junit.textui;version="[3.8.2,4.0.0)",
+ org.eclipse.jgit.junit;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.diff;version="[0.6.0,0.7.0)",
+ 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.fnmatch;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.merge;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.patch;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revplot;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk.filter;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)",
+ org.eclipse.jgit.util.io;version="[0.6.0,0.7.0)"

diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index a6710cd526fc42aae925a1c4b9393dc9ae3280f8..86b7f8860486fd7a30b5e94a90210a43d5fe5922 100644 (file)
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Version: 0.6.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.jgit.awtui;version="0.6.0"
-Import-Package: com.jcraft.jsch,
- org.eclipse.jgit.lib;version="0.6.0",
- org.eclipse.jgit.transport,
- org.eclipse.jgit.revplot,
- org.eclipse.jgit.revwalk,
- org.eclipse.jgit.util
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
+ org.eclipse.jgit.lib;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.transport;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revplot;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)",
+ org.eclipse.jgit.util;version="[0.6.0,0.7.0)"

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 5c7f111fb9490b143b8b8972f9dfac1f020412ed..93e0702f47fd6934713d925cfa41fa2bc279aade 100644 (file)
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Export-Package: org.eclipse.jgit.diff;version="0.6.0",
  org.eclipse.jgit.util.io;version="0.6.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch
+Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)"