From 179a9ba4a2f33b52c74c9a9685985232ace68c89 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" <spearce@spearce.org> Date: Tue, 2 Feb 2010 20:03:03 -0800 Subject: [PATCH] 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> --- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 6 +-- .../META-INF/MANIFEST.MF | 12 ++--- .../META-INF/MANIFEST.MF | 50 +++++++++---------- org.eclipse.jgit.iplog/META-INF/MANIFEST.MF | 24 ++++----- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 34 ++++++------- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 30 +++++------ org.eclipse.jgit.test/META-INF/MANIFEST.MF | 38 +++++++------- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 12 ++--- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- 9 files changed, 104 insertions(+), 104 deletions(-) diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index ed12693f0..1b9d677fe 100644 --- 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 92b02e876..2905a013e 100644 --- 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 1481391f5..9e6e77aab 100644 --- 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 41a70f87d..9533cf875 100644 --- 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 0ff1c0f96..b2a519534 100644 --- 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 d69f14a73..d80cf1500 100644 --- 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 32d5efdfc..47b028066 100644 --- 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 a6710cd52..86b7f8860 100644 --- 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 5c7f111fb..93e0702f4 100644 --- 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)" -- GitLab