Merging api branch back to HEADv20100113

1 files changed, 27 insertions, 12 deletions

diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
index 07e2c28c9..d3106ee44 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 2.0.0.qualifier
 Export-Package: org.eclipse.equinox.internal.p2.metadata;
   x-friends:="org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.metadata.repository,
@@ -13,13 +13,17 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
    org.eclipse.equinox.p2.ui,
+   org.eclipse.equinox.p2.operations,
    org.eclipse.equinox.p2.publisher,
-   org.eclipse.equinox.p2.director",
- org.eclipse.equinox.internal.provisional.p2.metadata;
+   org.eclipse.equinox.p2.director,
+   org.eclipse.equinox.p2.director.app,
+   org.eclipse.equinox.p2.installer",
+ org.eclipse.equinox.internal.p2.metadata.expression;x-friends:="org.eclipse.equinox.p2.ql",
+ org.eclipse.equinox.internal.p2.metadata.expression.parser;x-friends:="org.eclipse.equinox.p2.ql",
+ org.eclipse.equinox.internal.p2.metadata.query;
   x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
    org.eclipse.equinox.p2.artifact.repository,
-   org.eclipse.equinox.p2.console,
    org.eclipse.equinox.p2.core,
    org.eclipse.equinox.p2.director,
    org.eclipse.equinox.p2.director.app,
@@ -33,23 +37,29 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.metadata,
    org.eclipse.equinox.p2.metadata.generator,
    org.eclipse.equinox.p2.metadata.repository,
-   org.eclipse.equinox.p2.publisher,
+   org.eclipse.equinox.p2.operations,
+   org.eclipse.equinox.p2.ql,
    org.eclipse.equinox.p2.reconciler.dropins,
    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.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
    org.eclipse.equinox.p2.ui.sdk.scheduler,
    org.eclipse.equinox.p2.updatechecker,
    org.eclipse.equinox.p2.updatesite,
+   org.eclipse.equinox.p2.console,
+   org.eclipse.equinox.p2.publisher,
    org.eclipse.pde.ui,
    org.eclipse.equinox.p2.repository.tools,
    org.eclipse.pde.core",
- org.eclipse.equinox.internal.provisional.p2.metadata.query;
+ org.eclipse.equinox.internal.p2.query;x-friends:="org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.ui",
+ org.eclipse.equinox.internal.provisional.p2.metadata;
   x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
    org.eclipse.equinox.p2.artifact.repository,
+   org.eclipse.equinox.p2.console,
    org.eclipse.equinox.p2.core,
    org.eclipse.equinox.p2.director,
    org.eclipse.equinox.p2.director.app,
@@ -63,28 +73,33 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.metadata,
    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.ql,
    org.eclipse.equinox.p2.reconciler.dropins,
    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.admin.rcp,
    org.eclipse.equinox.p2.ui.sdk,
    org.eclipse.equinox.p2.ui.sdk.scheduler,
    org.eclipse.equinox.p2.updatechecker,
    org.eclipse.equinox.p2.updatesite,
-   org.eclipse.equinox.p2.console,
-   org.eclipse.equinox.p2.publisher,
    org.eclipse.pde.ui,
    org.eclipse.equinox.p2.repository.tools,
-   org.eclipse.pde.core"
+   org.eclipse.pde.core",
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.expression,
+ org.eclipse.equinox.p2.metadata.query,
+ org.eclipse.equinox.p2.query
 Import-Package: org.eclipse.osgi.service.localization;version="1.0.0",
  org.eclipse.osgi.util,
  org.osgi.framework;version="1.3.0"
 Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator
 Bundle-ActivationPolicy: lazy
-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
 Require-Bundle: org.eclipse.equinox.common,
  org.eclipse.equinox.p2.core,
  org.eclipse.osgi;bundle-version="3.5.0"