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>

diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index c86161283531028ea45d734c583e00e5d32ad565..82985d5e003e54dd251dec9c15e57c9a79b21b68 100644 (file)
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/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"

diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 77caf7b1df849a4ffd3f8b014a03d6c8d10134f3..e931043e29971e2b3e871c7e8e7e24a5ac3afa8e 100644 (file)
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/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"

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 4d9bb79cc89ec2f11c5891e5c7b5a1e7175a47ea..6f5bac9f0a6d0b01de6a7f468f5a61df26a09593 100644 (file)
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/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)",

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index dee0cdd8a6eb385704b55df9e5069e4486b1ed28..6bcef865c04104d71fc2e2e9e4e9feb9cf19681e 100644 (file)
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/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

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 3870ecbae402fa64521dbd228459e6afb297ccdc..0e0fa660a5adaec8a6e951c841110ad201f1109e 100644 (file)
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/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