Decouple BouncyCastle from JGit Core

Motivation: BouncyCastle serves as 'default' implementation of
the GPG Signer. If a client application does not use it there is no need
to pull in this dependency, especially since BouncyCastle is a large
library.

Move the classes depending on BouncyCastle to an OSGi fragment extending
the org.eclipse.jgit bundle. They are moved to a distinct internal
package in order to avoid split packages. This doesn't break public API
since these classes were already in an internal package before this
change.

Add a new feature org.eclipse.jgit.gpg.bc to enable installation. With
that users can now decide if they want to install it.

Attempts to sign a commit if org.eclipse.jgit.gpg.bc isn't available
will result in ServiceUnavailableException being thrown.

Bug: 559106
Change-Id: I42fd6c00002e17aa9a7be96ae434b538ea86ccf8
Also-by: Michael Dardis <git@md-5.net>
Signed-off-by: Michael Dardis <git@md-5.net>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: David Ostrovsky <david@ostrovsky.org>

1 files changed, 77 insertions, 65 deletions

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 1cdb6417b4..1479cf99a1 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -6,54 +6,56 @@ Bundle-SymbolicName: org.eclipse.jgit
 Bundle-Version: 5.8.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
+Eclipse-ExtensibleAPI: true
 Export-Package: org.eclipse.jgit.annotations;version="5.8.0",
  org.eclipse.jgit.api;version="5.8.0";
-  uses:="org.eclipse.jgit.revwalk,
-   org.eclipse.jgit.treewalk.filter,
-   org.eclipse.jgit.diff,
-   org.eclipse.jgit.util,
+  uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.notes,
    org.eclipse.jgit.dircache,
-   org.eclipse.jgit.api.errors,
    org.eclipse.jgit.lib,
+   org.eclipse.jgit.revwalk,
+   org.eclipse.jgit.treewalk.filter,
+   org.eclipse.jgit.diff,
    org.eclipse.jgit.treewalk,
-   org.eclipse.jgit.blame,
+   org.eclipse.jgit.util,
    org.eclipse.jgit.submodule,
-   org.eclipse.jgit.transport,
+   org.eclipse.jgit.api.errors,
+   org.eclipse.jgit.revwalk.filter,
+   org.eclipse.jgit.blame,
    org.eclipse.jgit.merge",
  org.eclipse.jgit.api.errors;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.8.0",
+ org.eclipse.jgit.attributes;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk",
  org.eclipse.jgit.blame;version="5.8.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff",
  org.eclipse.jgit.diff;version="5.8.0";
-  uses:="org.eclipse.jgit.patch,
-   org.eclipse.jgit.lib,
-   org.eclipse.jgit.treewalk,
+  uses:="org.eclipse.jgit.lib,
+   org.eclipse.jgit.attributes,
    org.eclipse.jgit.revwalk,
+   org.eclipse.jgit.patch,
    org.eclipse.jgit.treewalk.filter,
+   org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util",
  org.eclipse.jgit.dircache;version="5.8.0";
-  uses:="org.eclipse.jgit.lib,
+  uses:="org.eclipse.jgit.events,
+   org.eclipse.jgit.lib,
+   org.eclipse.jgit.attributes,
    org.eclipse.jgit.treewalk,
-   org.eclipse.jgit.util,
-   org.eclipse.jgit.events,
-   org.eclipse.jgit.attributes",
+   org.eclipse.jgit.util",
  org.eclipse.jgit.errors;version="5.8.0";
-  uses:="org.eclipse.jgit.lib,
-   org.eclipse.jgit.internal.storage.pack,
-   org.eclipse.jgit.transport,
-   org.eclipse.jgit.dircache",
+  uses:="org.eclipse.jgit.transport,
+   org.eclipse.jgit.dircache,
+   org.eclipse.jgit.lib,
+   org.eclipse.jgit.internal.storage.pack",
  org.eclipse.jgit.events;version="5.8.0";uses:="org.eclipse.jgit.lib",
  org.eclipse.jgit.fnmatch;version="5.8.0",
  org.eclipse.jgit.gitrepo;version="5.8.0";
-  uses:="org.eclipse.jgit.api,
+  uses:="org.xml.sax.helpers,
+   org.eclipse.jgit.api,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
-   org.xml.sax.helpers,
    org.xml.sax",
  org.eclipse.jgit.gitrepo.internal;version="5.8.0";x-internal:=true,
  org.eclipse.jgit.hooks;version="5.8.0";uses:="org.eclipse.jgit.lib",
@@ -91,70 +93,91 @@ Export-Package: org.eclipse.jgit.annotations;version="5.8.0",
  org.eclipse.jgit.internal.transport.parser;version="5.8.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test",
  org.eclipse.jgit.internal.transport.ssh;version="5.8.0";x-friends:="org.eclipse.jgit.ssh.apache",
  org.eclipse.jgit.lib;version="5.8.0";
-  uses:="org.eclipse.jgit.revwalk,
-   org.eclipse.jgit.treewalk.filter,
-   org.eclipse.jgit.util,
-   org.eclipse.jgit.events,
+  uses:="org.eclipse.jgit.transport,
+   org.eclipse.jgit.util.sha1,
    org.eclipse.jgit.dircache,
+   org.eclipse.jgit.revwalk,
    org.eclipse.jgit.internal.storage.file,
+   org.eclipse.jgit.attributes,
+   org.eclipse.jgit.events,
+   com.googlecode.javaewah,
+   org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk,
-   org.eclipse.jgit.transport,
-   org.eclipse.jgit.submodule",
+   org.eclipse.jgit.util,
+   org.eclipse.jgit.submodule,
+   org.eclipse.jgit.util.time",
  org.eclipse.jgit.lib.internal;version="5.8.0";x-friends:="org.eclipse.jgit.test",
  org.eclipse.jgit.merge;version="5.8.0";
-  uses:="org.eclipse.jgit.lib,
-   org.eclipse.jgit.treewalk,
+  uses:="org.eclipse.jgit.dircache,
+   org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.diff,
-   org.eclipse.jgit.dircache,
-   org.eclipse.jgit.api",
+   org.eclipse.jgit.treewalk,
+   org.eclipse.jgit.util,
+   org.eclipse.jgit.api,
+   org.eclipse.jgit.attributes",
  org.eclipse.jgit.nls;version="5.8.0",
  org.eclipse.jgit.notes;version="5.8.0";
   uses:="org.eclipse.jgit.lib,
-   org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
+   org.eclipse.jgit.treewalk,
    org.eclipse.jgit.merge",
  org.eclipse.jgit.patch;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
  org.eclipse.jgit.revplot;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
  org.eclipse.jgit.revwalk;version="5.8.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.treewalk.filter,
+   org.eclipse.jgit.revwalk.filter,
+   org.eclipse.jgit.treewalk",
  org.eclipse.jgit.revwalk.filter;version="5.8.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
  org.eclipse.jgit.storage.file;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
  org.eclipse.jgit.storage.pack;version="5.8.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.submodule;version="5.8.0";
+  uses:="org.eclipse.jgit.lib,
+   org.eclipse.jgit.diff,
+   org.eclipse.jgit.treewalk.filter,
+   org.eclipse.jgit.treewalk,
+   org.eclipse.jgit.util",
  org.eclipse.jgit.transport;version="5.8.0";
-  uses:="org.eclipse.jgit.transport.resolver,
-   org.eclipse.jgit.revwalk,
-   org.eclipse.jgit.internal.storage.pack,
-   com.jcraft.jsch,
-   org.eclipse.jgit.util,
+  uses:="javax.crypto,
    org.eclipse.jgit.util.io,
-   org.eclipse.jgit.internal.storage.file,
-   org.eclipse.jgit.internal.transport.parser,
    org.eclipse.jgit.lib,
+   org.eclipse.jgit.revwalk,
    org.eclipse.jgit.transport.http,
+   org.eclipse.jgit.internal.storage.file,
+   org.eclipse.jgit.treewalk,
+   org.eclipse.jgit.internal.transport.ssh,
+   org.eclipse.jgit.util,
+   org.eclipse.jgit.internal.storage.pack,
+   org.eclipse.jgit.transport.resolver,
+   org.eclipse.jgit.storage.pack,
    org.eclipse.jgit.errors,
-   org.eclipse.jgit.storage.pack",
+   com.jcraft.jsch",
  org.eclipse.jgit.transport.http;version="5.8.0";uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.8.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
+ org.eclipse.jgit.transport.resolver;version="5.8.0";uses:="org.eclipse.jgit.transport,org.eclipse.jgit.lib",
  org.eclipse.jgit.treewalk;version="5.8.0";
-  uses:="org.eclipse.jgit.lib,
-   org.eclipse.jgit.revwalk,
+  uses:="org.eclipse.jgit.dircache,
+   org.eclipse.jgit.lib,
    org.eclipse.jgit.attributes,
+   org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
-   org.eclipse.jgit.util,
-   org.eclipse.jgit.dircache",
+   org.eclipse.jgit.util",
  org.eclipse.jgit.treewalk.filter;version="5.8.0";uses:="org.eclipse.jgit.treewalk",
  org.eclipse.jgit.util;version="5.8.0";
-  uses:="org.eclipse.jgit.lib,
-   org.eclipse.jgit.transport.http,
+  uses:="org.eclipse.jgit.transport,
+   org.eclipse.jgit.hooks,
+   org.eclipse.jgit.revwalk,
    org.eclipse.jgit.storage.file,
-   org.ietf.jgss",
- org.eclipse.jgit.util.io;version="5.8.0",
+   org.ietf.jgss,
+   org.eclipse.jgit.attributes,
+   javax.management,
+   org.eclipse.jgit.lib,
+   org.eclipse.jgit.transport.http,
+   org.eclipse.jgit.treewalk,
+   javax.net.ssl,
+   org.eclipse.jgit.util.time",
+ org.eclipse.jgit.util.io;version="5.8.0";uses:="org.eclipse.jgit.attributes,org.eclipse.jgit.lib,org.eclipse.jgit.treewalk",
  org.eclipse.jgit.util.sha1;version="5.8.0",
  org.eclipse.jgit.util.time;version="5.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -162,17 +185,6 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  com.jcraft.jsch;version="[0.1.37,0.2.0)",
  javax.crypto,
  javax.net.ssl,
- org.bouncycastle;version="[1.65.0,2.0.0)",
- org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
- org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
- org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
- org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
  org.slf4j;version="[1.7.0,2.0.0)",
  org.xml.sax,
  org.xml.sax.helpers