Fixes to refer to org.osgi.service.remoteserviceadmin (version 5.0)
rather than ECF-specific org.eclipse.osgi.service.remoteserviceadmin
plugin.
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
index 1b753eb..3a6cffc 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
@@ -11,11 +11,11 @@
org.osgi.framework;version="1.3.0",
org.osgi.framework.hooks.service;version="1.0.0",
org.osgi.service.log;version="1.3.0",
+ org.osgi.service.remoteserviceadmin;version="5.0.0",
org.osgi.util.tracker
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.ecf.internal.osgi.services.distribution;version="2.0.0";x-internal:=true,
org.eclipse.ecf.osgi.services.distribution;version="2.0.0";x-internal:=true
Require-Bundle: org.eclipse.equinox.common,
- org.eclipse.ecf.osgi.services.remoteserviceadmin;bundle-version="1.0.0",
- org.eclipse.osgi.services.remoteserviceadmin;bundle-version="1.5.0"
+ org.eclipse.ecf.osgi.services.remoteserviceadmin;bundle-version="1.0.0"
diff --git a/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF b/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
index de345e3..9e551a3 100644
--- a/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
+++ b/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.ecf.osgi.services.remoteserviceadmin,
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
+ org.osgi.service.remoteserviceadmin;version="5.0.0",
org.osgi.util.tracker
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",
- org.eclipse.osgi.services.remoteserviceadmin;bundle-version="1.5.0"
+Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0"
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index ea9bc68..3478aa7 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@
Export-Package: org.eclipse.ecf.internal.osgi.services.remoteserviceadmin;x-internal:=true,
org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.0.0"
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",
- org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy;bundle-version="1.0.0",
- org.eclipse.osgi.services.remoteserviceadmin
+ org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity,
@@ -27,5 +26,6 @@
org.osgi.framework.wiring;version="[1.0,2.0)",
org.osgi.service.event,
org.osgi.service.log,
+ org.osgi.service.remoteserviceadmin;version="5.0.0",
org.osgi.util.tracker
DynamicImport-Package: *
diff --git a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index ebc3fa5..677a627 100644
--- a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@
Bundle-Localization: bundle
Bundle-Description: %bundle.description
Bundle-Copyright: %bundle.copyright
-Export-Package: org.osgi.service.remoteserviceadmin
+Export-Package: org.osgi.service.remoteserviceadmin;version="5.0.0"
Import-Package: org.osgi.framework
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index 674fa2e..926cbb1 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -19,9 +19,9 @@
org.eclipse.ecf.tests.remoteservice,
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
+ org.osgi.service.remoteserviceadmin;version="5.0.0",
org.osgi.util.tracker
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",
org.junit;bundle-version="3.8.0",
- org.eclipse.ecf.tests;bundle-version="2.1.0",
- org.eclipse.osgi.services.remoteserviceadmin;bundle-version="1.5.0"
+ org.eclipse.ecf.tests;bundle-version="2.1.0"
Export-Package: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin;version="1.1.1"
