Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2019-11-05 08:29:01 +0000
committerKarsten Thoms2019-11-05 08:29:01 +0000
commit1eeaa0a89be9a58365d84bb4815b432aa9d070f2 (patch)
tree138fee4a31e2e687aec7790dd15fa3bac32b3363
parentefac15e6530e2172ed2fd55d90f1171f68a91f1b (diff)
downloadeclipse.platform.team-1eeaa0a89be9a58365d84bb4815b432aa9d070f2.tar.gz
eclipse.platform.team-1eeaa0a89be9a58365d84bb4815b432aa9d070f2.tar.xz
eclipse.platform.team-1eeaa0a89be9a58365d84bb4815b432aa9d070f2.zip
Bug 552680 - Configure x-friends in platform-team properly
Declare friends of internal API within platform-team. Change-Id: Ib5fd31b61c515245d9aaf2a6a5cceaffd6417824 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.compare/META-INF/MANIFEST.MF4
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
index 6c5e184c2..587874489 100644
--- a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.compare.internal.core;x-friends:="org.eclipse.compare",
- org.eclipse.compare.internal.core.patch;x-friends:="org.eclipse.compare",
- org.eclipse.compare.patch; core="split"; mandatory:="core",
+ org.eclipse.compare.internal.core.patch;x-friends:="org.eclipse.compare,org.eclipse.team.ui",
+ org.eclipse.compare.patch;core=split;mandatory:=core,
org.eclipse.compare.rangedifferencer
Import-Package: com.ibm.icu.text;version="3.6.1"
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
index 15d1b66d2..0207f53e8 100644
--- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.compare,
org.eclipse.compare.contentmergeviewer,
- org.eclipse.compare.internal;x-internal:=true,
+ org.eclipse.compare.internal;x-friends:="org.eclipse.team.ui",
org.eclipse.compare.internal.merge;x-internal:=true,
- org.eclipse.compare.internal.patch;x-internal:=true,
+ org.eclipse.compare.internal.patch;x-friends:="org.eclipse.team.ui",
org.eclipse.compare.patch,
org.eclipse.compare.structuremergeviewer
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

Back to the top