Update uses-clauses in OSGi manifests

In Bug 476164 it was reported that EGit doesn't start when the platform
comes with jsch 0.1.51 while this version of EGit/JGit brings jsch
0.1.53. This could be caused by outdated uses-clauses. Hence recompute
them using PDE tooling.

Bug: 476164
Change-Id: I185ba097884ead9cd034eba842bd3bf34181a99b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2015-08-31 09:38:18 +02:00
parent 05acf1c62f
commit 3a4a5a4e57
5 changed files with 42 additions and 15 deletions

View File

@ -26,4 +26,5 @@ Export-Package: org.eclipse.jgit.transport.http.apache;version="4.1.0";
javax.net.ssl, javax.net.ssl,
org.apache.http.client, org.apache.http.client,
org.apache.http.client.methods, org.apache.http.client.methods,
org.apache.http" org.apache.http",
org.eclipse.jgit.transport.http.apache.internal;x-internal:=true

View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.jgit.junit.http
Bundle-Version: 4.1.0.qualifier Bundle-Version: 4.1.0.qualifier
Bundle-Localization: plugin Bundle-Localization: plugin
Bundle-Vendor: %provider_name Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.servlet;version="[2.5.0,3.2.0)", Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)",
@ -29,4 +28,14 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jgit.transport;version="[4.1.0,4.2.0)", org.eclipse.jgit.transport;version="[4.1.0,4.2.0)",
org.eclipse.jgit.transport.resolver;version="[4.1.0,4.2.0)", org.eclipse.jgit.transport.resolver;version="[4.1.0,4.2.0)",
org.junit;version="[4.0.0,5.0.0)" org.junit;version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.jgit.junit.http;version="4.1.0" Export-Package: org.eclipse.jgit.junit.http;version="4.1.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
javax.servlet.http,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jetty.server.handler,
javax.servlet,
org.eclipse.jetty.server,
org.eclipse.jetty.util.log,
org.eclipse.jetty.servlet"

View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.jgit.junit
Bundle-Version: 4.1.0.qualifier Bundle-Version: 4.1.0.qualifier
Bundle-Localization: plugin Bundle-Localization: plugin
Bundle-Vendor: %provider_name Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.jgit.api;version="[4.1.0,4.2.0)", Import-Package: org.eclipse.jgit.api;version="[4.1.0,4.2.0)",
org.eclipse.jgit.api.errors;version="[4.1.0,4.2.0)", org.eclipse.jgit.api.errors;version="[4.1.0,4.2.0)",
@ -22,4 +21,12 @@ Import-Package: org.eclipse.jgit.api;version="[4.1.0,4.2.0)",
org.eclipse.jgit.util;version="[4.1.0,4.2.0)", org.eclipse.jgit.util;version="[4.1.0,4.2.0)",
org.eclipse.jgit.util.io;version="[4.1.0,4.2.0)", org.eclipse.jgit.util.io;version="[4.1.0,4.2.0)",
org.junit;version="[4.0.0,5.0.0)" org.junit;version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.jgit.junit;version="4.1.0" Export-Package: org.eclipse.jgit.junit;version="4.1.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.file,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.storage.file,
org.eclipse.jgit.api"

View File

@ -37,8 +37,9 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
org.eclipse.jgit.util.io;version="[4.1.0,4.2.0)", org.eclipse.jgit.util.io;version="[4.1.0,4.2.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)",
org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)"
Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.jgit.console;version="4.1.0";
Export-Package: org.eclipse.jgit.console;version="4.1.0", uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
org.eclipse.jgit.pgm;version="4.1.0"; org.eclipse.jgit.pgm;version="4.1.0";
uses:="org.eclipse.jgit.revwalk, uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk.filter,
@ -50,7 +51,9 @@ Export-Package: org.eclipse.jgit.console;version="4.1.0",
org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk,
javax.swing, javax.swing,
org.eclipse.jgit.transport", org.eclipse.jgit.transport",
org.eclipse.jgit.pgm.debug;version="4.1.0";uses:="org.eclipse.jgit.pgm", org.eclipse.jgit.pgm.debug;version="4.1.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm",
org.eclipse.jgit.pgm.internal;version="4.1.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", org.eclipse.jgit.pgm.internal;version="4.1.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
org.eclipse.jgit.pgm.opt;version="4.1.0"; org.eclipse.jgit.pgm.opt;version="4.1.0";
uses:="org.eclipse.jgit.lib, uses:="org.eclipse.jgit.lib,

View File

@ -20,7 +20,8 @@ Export-Package: org.eclipse.jgit.api;version="4.1.0";
org.eclipse.jgit.transport, org.eclipse.jgit.transport,
org.eclipse.jgit.merge", org.eclipse.jgit.merge",
org.eclipse.jgit.api.errors;version="4.1.0"; org.eclipse.jgit.api.errors;version="4.1.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
org.eclipse.jgit.attributes;version="4.1.0", org.eclipse.jgit.attributes;version="4.1.0",
org.eclipse.jgit.blame;version="4.1.0"; org.eclipse.jgit.blame;version="4.1.0";
uses:="org.eclipse.jgit.lib, uses:="org.eclipse.jgit.lib,
@ -51,9 +52,12 @@ Export-Package: org.eclipse.jgit.api;version="4.1.0";
org.eclipse.jgit.gitrepo;version="4.1.0"; org.eclipse.jgit.gitrepo;version="4.1.0";
uses:="org.eclipse.jgit.api, uses:="org.eclipse.jgit.api,
org.eclipse.jgit.lib, org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk", org.eclipse.jgit.revwalk,
org.xml.sax.helpers,
org.xml.sax",
org.eclipse.jgit.gitrepo.internal;version="4.1.0";x-internal:=true, org.eclipse.jgit.gitrepo.internal;version="4.1.0";x-internal:=true,
org.eclipse.jgit.hooks;version="4.1.0", org.eclipse.jgit.hooks;version="4.1.0";
uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.ignore;version="4.1.0", org.eclipse.jgit.ignore;version="4.1.0",
org.eclipse.jgit.ignore.internal;version="4.1.0";x-friends:="org.eclipse.jgit.test", org.eclipse.jgit.ignore.internal;version="4.1.0";x-friends:="org.eclipse.jgit.test",
org.eclipse.jgit.internal;version="4.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", org.eclipse.jgit.internal;version="4.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
@ -92,7 +96,8 @@ Export-Package: org.eclipse.jgit.api;version="4.1.0";
org.eclipse.jgit.revwalk, org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge", org.eclipse.jgit.merge",
org.eclipse.jgit.patch;version="4.1.0"; org.eclipse.jgit.patch;version="4.1.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
org.eclipse.jgit.revplot;version="4.1.0"; org.eclipse.jgit.revplot;version="4.1.0";
uses:="org.eclipse.jgit.lib, uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk", org.eclipse.jgit.revwalk",
@ -103,9 +108,12 @@ Export-Package: org.eclipse.jgit.api;version="4.1.0";
org.eclipse.jgit.diff, org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter", org.eclipse.jgit.revwalk.filter",
org.eclipse.jgit.revwalk.filter;version="4.1.0"; org.eclipse.jgit.revwalk.filter;version="4.1.0";
uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util", uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
org.eclipse.jgit.storage.file;version="4.1.0"; org.eclipse.jgit.storage.file;version="4.1.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
org.eclipse.jgit.storage.pack;version="4.1.0"; org.eclipse.jgit.storage.pack;version="4.1.0";
uses:="org.eclipse.jgit.lib", uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.submodule;version="4.1.0"; org.eclipse.jgit.submodule;version="4.1.0";
@ -144,7 +152,6 @@ Export-Package: org.eclipse.jgit.api;version="4.1.0";
org.eclipse.jgit.storage.file, org.eclipse.jgit.storage.file,
org.ietf.jgss", org.ietf.jgss",
org.eclipse.jgit.util.io;version="4.1.0" org.eclipse.jgit.util.io;version="4.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)",
org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional