Bug 177869 Please revert the changes in bug 177843 - causing build breakagev20070318

3 files changed, 38 insertions, 38 deletions

diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
index 8b5a3e8bc..af1a5a258 100644
--- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -9,18 +9,18 @@ Bundle-Vendor: %eclipse.org
 Bundle-DocUrl: http://www.eclipse.org
 Bundle-ContactAddress: www.eclipse.org
 Bundle-Copyright: %copyright
-Export-Package: org.osgi.service.cm;version="1.2";uses:="org.osgi.framework",
- org.osgi.service.component;version="1.0";uses:="org.osgi.framework",
- org.osgi.service.device;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.event;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.http;version="1.2";uses:="javax.servlet,javax.servlet.http",
- org.osgi.service.io;version="1.0";uses:="javax.microedition.io",
- org.osgi.service.log;version="1.3";uses:="org.osgi.framework",
- org.osgi.service.metatype;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.provisioning;version="1.1",
- org.osgi.service.upnp;version="1.1",
- org.osgi.service.useradmin;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.wireadmin;version="1.0";uses:="org.osgi.framework"
+Export-Package: org.osgi.service.cm; version="1.2",
+ org.osgi.service.component; version="1.0",
+ org.osgi.service.device; version="1.1",
+ org.osgi.service.event; version="1.1",
+ org.osgi.service.http; version="1.2",
+ org.osgi.service.io; version="1.0",
+ org.osgi.service.log; version="1.3",
+ org.osgi.service.metatype; version="1.1",
+ org.osgi.service.provisioning; version="1.1",
+ org.osgi.service.upnp; version="1.1",
+ org.osgi.service.useradmin; version="1.1",
+ org.osgi.service.wireadmin; version="1.0"
 Import-Package: org.osgi.framework; version=1.2,
  javax.servlet; resolution:="optional",
  javax.servlet.http; resolution:="optional"
diff --git a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
index a9dab174a..646b58f8c 100644
--- a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-Localization: plugin
 Bundle-DocUrl: http://www.eclipse.org
 Bundle-ContactAddress: www.eclipse.org
 Bundle-Copyright: %copyright
-Export-Package: org.osgi.util.measurement;version="1.0",
- org.osgi.util.position;version="1.0";uses:="org.osgi.util.measurement",
- org.osgi.util.xml;version="1.0";uses:="javax.xml.parsers,org.osgi.framework"
+Export-Package: org.osgi.util.measurement; version="1.0",
+ org.osgi.util.position; version="1.0",
+ org.osgi.util.xml; version="1.0"
 Import-Package: org.osgi.framework; version=1.1
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 3a5a8e87f..306ae3969 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -1,17 +1,35 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.runtime",
+Export-Package: org.eclipse.osgi.event;version="1.0",
+ org.eclipse.osgi.framework.console;version="1.0",
+ org.eclipse.osgi.framework.eventmgr;version="1.0",
+ org.eclipse.osgi.framework.log;version="1.0",
+ org.eclipse.osgi.service.datalocation;version="1.0",
+ org.eclipse.osgi.service.debug;version="1.0",
+ org.eclipse.osgi.service.environment;version="1.0",
+ org.eclipse.osgi.service.localization;version="1.0",
+ org.eclipse.osgi.service.pluginconversion;version="1.0",
+ org.eclipse.osgi.service.resolver;version="1.1",
+ org.eclipse.osgi.service.runnable;version="1.1",
+ org.eclipse.osgi.service.urlconversion;version="1.0",
+ org.eclipse.osgi.storagemanager;version="1.0",
+ org.eclipse.osgi.util;version="1.1",
+ org.osgi.framework;version="1.4",
+ org.osgi.service.condpermadmin;version="1.0",
+ org.osgi.service.packageadmin;version="1.2",
+ org.osgi.service.permissionadmin;version="1.2",
+ org.osgi.service.startlevel;version="1.1",
+ org.osgi.service.url;version="1.0",
+ org.osgi.util.tracker;version="1.3.3",
+ org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.runtime",
  org.eclipse.core.runtime.internal.adaptor;x-internal:=true,
  org.eclipse.core.runtime.internal.stats;x-friends:="org.eclipse.core.runtime",
  org.eclipse.osgi.baseadaptor;x-internal:=true,
  org.eclipse.osgi.baseadaptor.bundlefile;x-internal:=true,
  org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,
  org.eclipse.osgi.baseadaptor.loader;x-internal:=true,
- org.eclipse.osgi.event;version="1.0";uses:="org.osgi.framework",
  org.eclipse.osgi.framework.adaptor;x-internal:=true,
- org.eclipse.osgi.framework.console;version="1.0";uses:="org.osgi.framework",
  org.eclipse.osgi.framework.debug;x-internal:=true,
- org.eclipse.osgi.framework.eventmgr;version="1.0",
  org.eclipse.osgi.framework.internal.core;x-internal:=true,
  org.eclipse.osgi.framework.internal.protocol;x-internal:=true,
  org.eclipse.osgi.framework.internal.protocol.bundleentry;x-internal:=true,
@@ -19,31 +37,13 @@ Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.ru
  org.eclipse.osgi.framework.internal.protocol.reference;x-internal:=true,
  org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,
  org.eclipse.osgi.framework.launcher;x-internal:=true,
- org.eclipse.osgi.framework.log;version="1.0";uses:="org.osgi.framework",
  org.eclipse.osgi.framework.util;x-internal:=true,
  org.eclipse.osgi.internal.baseadaptor;x-internal:=true,
  org.eclipse.osgi.internal.module;x-internal:=true,
  org.eclipse.osgi.internal.profile;x-internal:=true,
- org.eclipse.osgi.internal.provisional.verifier;x-friends:="org.eclipse.update.core,org.eclipse.ui.workbench",
  org.eclipse.osgi.internal.resolver;x-internal:=true,
  org.eclipse.osgi.internal.verifier;x-internal:=true,
- org.eclipse.osgi.service.datalocation;version="1.0",
- org.eclipse.osgi.service.debug;version="1.0",
- org.eclipse.osgi.service.environment;version="1.0",
- org.eclipse.osgi.service.localization;version="1.0";uses:="org.osgi.framework",
- org.eclipse.osgi.service.pluginconversion;version="1.0",
- org.eclipse.osgi.service.resolver;version="1.1";uses:="org.osgi.framework",
- org.eclipse.osgi.service.runnable;version="1.1",
- org.eclipse.osgi.service.urlconversion;version="1.0",
- org.eclipse.osgi.storagemanager;version="1.0",
- org.eclipse.osgi.util;version="1.1",
- org.osgi.framework;version="1.4",
- org.osgi.service.condpermadmin;version="1.0";uses:="org.osgi.framework",
- org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
- org.osgi.service.permissionadmin;version="1.2",
- org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.url;version="1.0",
- org.osgi.util.tracker;version="1.3.3";uses:="org.osgi.framework"
+ org.eclipse.osgi.internal.provisional.verifier;x-friends:="org.eclipse.update.core,org.eclipse.ui.workbench"
 Export-Service: org.osgi.service.packageadmin.PackageAdmin,
  org.osgi.service.permissionadmin.PermissionAdmin,
  org.osgi.service.startlevel.StartLevel,