Browse Source

Add uses directives to ensure OSGi wires jgit bundles correctly

See
http://spring.io/blog/2008/10/20/understanding-the-osgi-uses-directive/

Bug: 420903
Change-Id: I3706a2b8f695d4ce0ee2333722ed7b8d31032f1e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-3.2
Matthias Sohn 11 years ago
parent
commit
b41b5d723e
  1. 3
      org.eclipse.jgit.ant/META-INF/MANIFEST.MF
  2. 6
      org.eclipse.jgit.archive/META-INF/MANIFEST.MF
  3. 9
      org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
  4. 21
      org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
  5. 127
      org.eclipse.jgit/META-INF/MANIFEST.MF

3
org.eclipse.jgit.ant/META-INF/MANIFEST.MF

@ -8,4 +8,5 @@ Import-Package: org.apache.tools.ant,
org.eclipse.jgit.storage.file;version="[3.2.0,3.3.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
Export-Package: org.eclipse.jgit.ant.tasks;version="3.2.0"
Export-Package: org.eclipse.jgit.ant.tasks;version="3.2.0";
uses:="org.apache.tools.ant.types,org.apache.tools.ant"

6
org.eclipse.jgit.archive/META-INF/MANIFEST.MF

@ -17,4 +17,8 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
Export-Package: org.eclipse.jgit.archive;version="3.2.0"
Export-Package: org.eclipse.jgit.archive;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.api,
org.apache.commons.compress.archivers,
org.osgi.framework"

9
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF

@ -7,8 +7,13 @@ Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package:
org.eclipse.jgit.http.server;version="3.2.0",
org.eclipse.jgit.http.server.glue;version="3.2.0",
org.eclipse.jgit.http.server.resolver;version="3.2.0"
org.eclipse.jgit.http.server.glue;version="3.2.0";
uses:="javax.servlet,javax.servlet.http",
org.eclipse.jgit.http.server.resolver;version="3.2.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
javax.servlet.http"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="[2.5.0,3.0.0)",

21
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF

@ -38,16 +38,23 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jgit.pgm;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.nls,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
javax.swing,
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.pgm.opt,
org.eclipse.jgit.diff,
org.eclipse.jgit.awtui,
org.eclipse.jgit.util.io,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
javax.swing,
org.eclipse.jgit.transport",
org.eclipse.jgit.pgm.debug;version="3.2.0",
org.eclipse.jgit.pgm.debug;version="3.2.0";
uses:="org.eclipse.jgit.pgm",
org.eclipse.jgit.pgm.internal;version="3.2.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
org.eclipse.jgit.pgm.opt;version="3.2.0"
org.eclipse.jgit.pgm.opt;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.kohsuke.args4j.spi,
org.kohsuke.args4j"
Main-Class: org.eclipse.jgit.pgm.Main
Implementation-Title: JGit Command Line Interface

127
org.eclipse.jgit/META-INF/MANIFEST.MF

@ -5,13 +5,45 @@ Bundle-SymbolicName: org.eclipse.jgit
Bundle-Version: 3.2.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.api;version="3.2.0",
org.eclipse.jgit.api.errors;version="3.2.0",
org.eclipse.jgit.blame;version="3.2.0",
org.eclipse.jgit.diff;version="3.2.0",
org.eclipse.jgit.dircache;version="3.2.0",
org.eclipse.jgit.errors;version="3.2.0",
org.eclipse.jgit.events;version="3.2.0",
Export-Package: org.eclipse.jgit.api;version="3.2.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.util,
org.eclipse.jgit.notes,
org.eclipse.jgit.dircache,
org.eclipse.jgit.api.errors,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.blame,
org.eclipse.jgit.transport,
org.eclipse.jgit.merge",
org.eclipse.jgit.api.errors;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
org.eclipse.jgit.blame;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
org.eclipse.jgit.diff;version="3.2.0";
uses:="org.eclipse.jgit.patch,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
org.eclipse.jgit.dircache;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.events",
org.eclipse.jgit.errors;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack,
org.eclipse.jgit.transport,
org.eclipse.jgit.dircache",
org.eclipse.jgit.events;version="3.2.0";
uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.fnmatch;version="3.2.0",
org.eclipse.jgit.ignore;version="3.2.0",
org.eclipse.jgit.internal;version="3.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
@ -23,26 +55,69 @@ Export-Package: org.eclipse.jgit.api;version="3.2.0",
org.eclipse.jgit.http.server,
org.eclipse.jgit.java7.test,
org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.pack;version="3.2.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
org.eclipse.jgit.lib;version="3.2.0",
org.eclipse.jgit.merge;version="3.2.0",
org.eclipse.jgit.internal.storage.pack;version="3.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.lib;version="3.2.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.events,
org.eclipse.jgit.dircache,
org.eclipse.jgit.internal.storage.file,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.transport",
org.eclipse.jgit.merge;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.diff,
org.eclipse.jgit.dircache",
org.eclipse.jgit.nls;version="3.2.0",
org.eclipse.jgit.notes;version="3.2.0",
org.eclipse.jgit.patch;version="3.2.0",
org.eclipse.jgit.revplot;version="3.2.0",
org.eclipse.jgit.revwalk;version="3.2.0",
org.eclipse.jgit.revwalk.filter;version="3.2.0",
org.eclipse.jgit.storage.file;version="3.2.0",
org.eclipse.jgit.storage.pack;version="3.2.0",
org.eclipse.jgit.submodule;version="3.2.0",
org.eclipse.jgit.transport;version="3.2.0";uses:="com.jcraft.jsch",
org.eclipse.jgit.transport.resolver;version="3.2.0",
org.eclipse.jgit.treewalk;version="3.2.0",
org.eclipse.jgit.treewalk.filter;version="3.2.0",
org.eclipse.jgit.util;version="3.2.0",
org.eclipse.jgit.notes;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge",
org.eclipse.jgit.patch;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
org.eclipse.jgit.revplot;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
org.eclipse.jgit.revwalk;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter",
org.eclipse.jgit.revwalk.filter;version="3.2.0";
uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util",
org.eclipse.jgit.storage.file;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
org.eclipse.jgit.storage.pack;version="3.2.0";
uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.submodule;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter",
org.eclipse.jgit.transport;version="3.2.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.pack,
com.jcraft.jsch,
org.eclipse.jgit.util,
org.eclipse.jgit.util.io,
org.eclipse.jgit.internal.storage.file,
org.eclipse.jgit.lib,
org.eclipse.jgit.errors,
org.eclipse.jgit.storage.pack",
org.eclipse.jgit.transport.resolver;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
org.eclipse.jgit.treewalk;version="3.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.dircache",
org.eclipse.jgit.treewalk.filter;version="3.2.0";
uses:="org.eclipse.jgit.treewalk",
org.eclipse.jgit.util;version="3.2.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.storage.file",
org.eclipse.jgit.util.io;version="3.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Loading…
Cancel
Save