Fix up import versions

1 files changed, 35 insertions, 35 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 114bd2684..7bee22b18 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -1,42 +1,44 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true
 Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-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,
-   org.eclipse.equinox.p2.engine,
-   org.eclipse.equinox.p2.artifact.repository,
-   org.eclipse.equinox.p2.artifact.optimizers,
+  x-friends:="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.artifact.repository,
    org.eclipse.equinox.p2.director,
    org.eclipse.equinox.p2.director.app,
+   org.eclipse.equinox.p2.engine,
    org.eclipse.equinox.p2.installer,
-   org.eclipse.equinox.p2.ql",
+   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.ui",
  org.eclipse.equinox.internal.p2.metadata.expression;
-  x-friends:="org.eclipse.equinox.p2.ql,
-   org.eclipse.equinox.p2.artifact.repository,
+  x-friends:="org.eclipse.equinox.p2.artifact.repository,
    org.eclipse.equinox.p2.directorywatcher,
+   org.eclipse.equinox.p2.engine,
    org.eclipse.equinox.p2.publisher,
-   org.eclipse.equinox.p2.engine",
+   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.index;
-  x-friends:="org.eclipse.equinox.p2.director,
+  x-friends:="org.eclipse.equinox.p2.artifact.repository,
+   org.eclipse.equinox.p2.director,
+   org.eclipse.equinox.p2.engine,
    org.eclipse.equinox.p2.metadata.repository,
-   org.eclipse.equinox.p2.artifact.repository,
    org.eclipse.equinox.p2.publisher,
-   org.eclipse.equinox.p2.engine,
    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,
@@ -51,8 +53,10 @@ Export-Package: org.eclipse.equinox.internal.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.repository.tools,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
    org.eclipse.equinox.p2.ui,
@@ -62,11 +66,8 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    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.pde.ui",
  org.eclipse.equinox.internal.provisional.p2.metadata;
   x-friends:="org.eclipse.equinox.p2.artifact.optimizers,
    org.eclipse.equinox.p2.artifact.processors,
@@ -89,6 +90,7 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.publisher,
    org.eclipse.equinox.p2.ql,
    org.eclipse.equinox.p2.reconciler.dropins,
+   org.eclipse.equinox.p2.repository.tools,
    org.eclipse.equinox.p2.touchpoint.eclipse,
    org.eclipse.equinox.p2.touchpoint.natives,
    org.eclipse.equinox.p2.ui,
@@ -97,23 +99,21 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
    org.eclipse.equinox.p2.ui.sdk.scheduler,
    org.eclipse.equinox.p2.updatechecker,
    org.eclipse.equinox.p2.updatesite,
-   org.eclipse.pde.ui,
-   org.eclipse.equinox.p2.repository.tools,
-   org.eclipse.pde.core",
- org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.metadata.expression,
- org.eclipse.equinox.p2.metadata.index,
- org.eclipse.equinox.p2.metadata.query,
- org.eclipse.equinox.p2.query
+   org.eclipse.pde.core,
+   org.eclipse.pde.ui",
+ org.eclipse.equinox.p2.metadata;version="2.0.0",
+ org.eclipse.equinox.p2.metadata.expression;version="2.0.0",
+ org.eclipse.equinox.p2.metadata.index;version="2.0.0",
+ org.eclipse.equinox.p2.metadata.query;version="2.0.0",
+ org.eclipse.equinox.p2.query;version="2.0.0"
+Require-Bundle: org.eclipse.equinox.common,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.osgi;bundle-version="3.5.0"
 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
+Service-Component: OSGI-INF/expressionFactory.xml, OSGI-INF/expressionParser.xml
 Bundle-ActivationPolicy: lazy
 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"
-Service-Component: OSGI-INF/expressionFactory.xml, OSGI-INF/expressionParser.xml