Merging api branch back to HEADv20100113

1 files changed, 10 insertions, 11 deletions

diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index de1a72cde..2f2feff92 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.2.0",
  org.eclipse.osgi.framework.log;version="1.0.0",
  org.eclipse.osgi.service.debug;version="1.0.0",
@@ -25,12 +25,14 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
    org.eclipse.equinox.p2.installer,
    org.eclipse.equinox.p2.metadata,
    org.eclipse.equinox.p2.metadata.generator,
+   org.eclipse.equinox.p2.operations,
    org.eclipse.equinox.frameworkadmin.test,
    org.eclipse.equinox.p2.metadata.repository,
    org.eclipse.equinox.p2.repositoryoptimizer,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
    org.eclipse.equinox.p2.ui,
+   org.eclipse.equinox.p2.ui.admin,
    org.eclipse.equinox.p2.ui.sdk,
    org.eclipse.equinox.p2.ui.sdk.scheduler,
    org.eclipse.equinox.p2.updatechecker,
@@ -42,7 +44,8 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
    org.eclipse.equinox.p2.extensionlocation,
    org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.repository.tools,
-   org.eclipse.equinox.p2.repository",
+   org.eclipse.equinox.p2.repository,
+   org.eclipse.equinox.p2.ql",
  org.eclipse.equinox.internal.provisional.p2.core;
   x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
@@ -56,6 +59,7 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
    org.eclipse.equinox.p2.installer,
    org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.metadata.repository,
+   org.eclipse.equinox.p2.operations,
    org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.reconciler.dropins,
    org.eclipse.equinox.p2.touchpoint.eclipse,
@@ -86,21 +90,16 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
    org.eclipse.equinox.p2.artifact.repository,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
+   org.eclipse.equinox.p2.operations,
    org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.repository",
- org.eclipse.equinox.internal.provisional.p2.core.location;
-  x-friends:="org.eclipse.equinox.p2.artifact.repository,
-   org.eclipse.equinox.p2.touchpoint.natives,
-   org.eclipse.equinox.p2.metadata.repository,
-   org.eclipse.equinox.p2.director,
-   org.eclipse.equinox.p2.engine,
-   org.eclipse.equinox.p2.touchpoint.eclipse",
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.core.spi
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ J2SE-1.4,
+ CDC-1.1/Foundation-1.1
 Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)"
 Service-Component: OSGI-INF/eventBus.xml, OSGI-INF/agentProvider.xml