Bug 403189 - Finalize e4 core API for kepler

4 files changed, 4 insertions, 24 deletions

diff --git a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
index edddd8731..386f750dc 100644
--- a/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.contexts/META-INF/MANIFEST.MF
@@ -11,18 +11,6 @@ Require-Bundle: org.eclipse.e4.core.di,
  org.eclipse.osgi;bundle-version="3.6.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.inject;version="1.0.0"
-Export-Package: org.eclipse.e4.core.contexts;
-  x-friends:="org.eclipse.e4.core.commands,
-   org.eclipse.e4.core.services,
-   org.eclipse.e4.ui.services,
-   org.eclipse.e4.ui.bindings,
-   org.eclipse.e4.ui.model.workbench,
-   org.eclipse.e4.ui.workbench,
-   org.eclipse.e4.ui.workbench.swt,
-   org.eclipse.e4.ui.css.swt,
-   org.eclipse.e4.ui.workbench.addons.swt,
-   org.eclipse.ui.workbench,
-   org.eclipse.e4.ui.workbench.renderers.swt,
-   org.eclipse.e4.core.contexts.debug",
+Export-Package: org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.internal.contexts;x-friends:="org.eclipse.e4.core.tests,org.eclipse.e4.core.contexts.debug",
  org.eclipse.e4.core.internal.contexts.osgi;x-internal:=true
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
index 06f27ea1f..212c4202f 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextFunction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
index 3929c4b6f..035aa69f5 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/IContextFunction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
index 21dae4d58..5b454ecc3 100644
--- a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
@@ -13,15 +13,7 @@ Export-Package: org.eclipse.e4.core.di;
    org.eclipse.e4.core.di.extensions,
    org.eclipse.e4.ui.workbench,
    org.eclipse.e4.ui.workbench.swt",
- org.eclipse.e4.core.di.annotations;
-  x-friends:="org.eclipse.e4.core.commands,
-   org.eclipse.e4.ui.bindings,
-   org.eclipse.e4.ui.workbench,
-   org.eclipse.e4.ui.di,
-   org.eclipse.e4.ui.workbench.addons.swt,
-   org.eclipse.e4.ui.workbench.renderers.swt,
-   org.eclipse.e4.ui.workbench.swt,
-   org.eclipse.ui.workbench",
+ org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.di.suppliers;x-friends:="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di.extensions,org.eclipse.e4.ui.di",
  org.eclipse.e4.core.internal.di;x-friends:="org.eclipse.e4.core.contexts",
  org.eclipse.e4.core.internal.di.osgi;x-internal:=true,