Remove discouraged access warnings from github bundles

Both the egit.github.* and mylyn.github.* bundles are managed by the
Eclipse EGit project. It seems reasonable to allow x-friend
access to egit internal packages in the same manner that other egit
bundles allow this, since incompatible changes will immediately lead to
compile errors.

The change only adds x-friends for actually existing discouraged access
warnings from *.github.* to *.egit.* (somewhat more than 100 warnings,
that are now gone). It does not fix any other discouraged access to
platform or mylyn.core.

Change-Id: Ib14c1a96b5f60bb354cd04e1fe3d23aae897ce6d
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

2 files changed, 12 insertions, 8 deletions

diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
index 8fb33179f0..1d55d17641 100644
--- a/org.eclipse.egit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Export-Package: org.eclipse.egit.core;version="4.9.0";
    org.eclipse.egit.ui.test,
    org.eclipse.egit.mylyn.ui,
    org.eclipse.egit.gitflow.test,
-   org.eclipse.egit.gitflow.ui",
+   org.eclipse.egit.gitflow.ui,
+   org.eclipse.mylyn.github.ui,
+   org.eclipse.mylyn.github.core",
  org.eclipse.egit.core.internal;version="4.9.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui",
  org.eclipse.egit.core.internal.gerrit;version="4.9.0";x-friends:="org.eclipse.egit.ui",
  org.eclipse.egit.core.internal.indexdiff;version="4.9.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
@@ -32,7 +34,9 @@ Export-Package: org.eclipse.egit.core;version="4.9.0";
    org.eclipse.egit.ui,
    org.eclipse.egit.gitflow,
    org.eclipse.egit.gitflow.test,
-   org.eclipse.egit.gitflow.ui",
+   org.eclipse.egit.gitflow.ui,
+   org.eclipse.egit.github.core,
+   org.eclipse.mylyn.github.ui",
  org.eclipse.egit.core.project;version="4.9.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui",
  org.eclipse.egit.core.securestorage;version="4.9.0";x-friends:="org.eclipse.egit.ui",
  org.eclipse.egit.core.storage;version="4.9.0";uses:="org.eclipse.core.runtime,org.eclipse.jgit.lib,org.eclipse.core.resources",
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index c6d72d8415..8f7b5c1528 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -70,23 +70,23 @@ Import-Package: org.eclipse.egit.core;version="[4.9.0,4.10.0)",
  org.eclipse.jgit.util;version="[4.9.0,4.10.0)",
  org.eclipse.jgit.util.io;version="[4.9.0,4.10.0)",
  org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.egit.ui;version="4.9.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal;version="4.9.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui",
+Export-Package: org.eclipse.egit.ui;version="4.9.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal;version="4.9.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
  org.eclipse.egit.ui.internal.actions;version="4.9.0";x-friends:="org.eclipse.egit.gitflow.ui",
  org.eclipse.egit.ui.internal.blame;version="4.9.0";x-internal:=true,
- org.eclipse.egit.ui.internal.branch;version="4.9.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.branch;version="4.9.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
  org.eclipse.egit.ui.internal.clean;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.clone;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.commands;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.commands.shared;version="4.9.0";x-internal:=true,
- org.eclipse.egit.ui.internal.commit;version="4.9.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.commit;version="4.9.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
  org.eclipse.egit.ui.internal.commit.command;version="4.9.0";x-internal:=true,
- org.eclipse.egit.ui.internal.components;version="4.9.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.components;version="4.9.0";x-friends:="org.eclipse.mylyn.github.ui",
  org.eclipse.egit.ui.internal.credentials;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.decorators;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.dialogs;version="4.9.0";x-friends:="org.eclipse.egit.gitflow.ui",
  org.eclipse.egit.ui.internal.factories;version="4.9.0";x-internal:=true,
- org.eclipse.egit.ui.internal.fetch;version="4.9.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.fetch;version="4.9.0";x-friends:="org.eclipse.mylyn.github.ui",
  org.eclipse.egit.ui.internal.gerrit;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.handler;version="4.9.0";x-internal:=true,
  org.eclipse.egit.ui.internal.history;version="4.9.0";x-internal:=true,