From f140ea18564d67ba6be2b17b27c91f1651ced19a Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Tue, 5 Sep 2023 12:33:51 -0700 Subject: [PATCH] Fix for https://github.com/eclipse/ecf/issues/67 Signed-off-by: Scott Lewis --- .../META-INF/MANIFEST.MF | 4 ++-- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF index 20d80b85af..e31c215418 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example REST Timeservice Consumer FileDiscovery Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.filediscovery.rest Automatic-Module-Name: com.mycorp.examples.timeservice.consumer.filediscovery.rest -Bundle-Version: 1.2.102.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Remote-Service: timeservicerestendpointdescription.xml -Require-Capability: osgi.extender; filter:=(&(osgi.extender=osgi.remoteserviceadmin) (version>=1.1) (!(version>=2.0))) +Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.remoteserviceadmin)(version>=1.1)(!(version>=2.0)))" diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml index 32c1b2ed75..e36ebc8079 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/pom.xml @@ -9,7 +9,7 @@ ../../../ com.mycorp.examples.timeservice.consumer.filediscovery.rest - 1.2.102-SNAPSHOT + 1.2.200-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/META-INF/MANIFEST.MF index 500c7f48c9..6b30df8902 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example TimeService Consumer FileDiscovery Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.filediscovery Automatic-Module-Name: com.mycorp.examples.timeservice.consumer.filediscovery -Bundle-Version: 1.2.103.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Remote-Service: edef/timeserviceendpointdescription.xml -Require-Capability: osgi.extender; filter:=(&(osgi.extender=osgi.remoteserviceadmin) (version>=1.1) (!(version>=2.0))), +Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.remoteserviceadmin)(version>=1.1)(!(version>=2.0)))", osgi.extender;filter:="(&(osgi.extender=osgi.remoteserviceadmin.localdiscovery)(version>=1.0)(!(version>=2.0)))" diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml index 243aa33cb8..22b9a356e4 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/pom.xml @@ -9,7 +9,7 @@ ../../../ com.mycorp.examples.timeservice.consumer.filediscovery - 1.2.103-SNAPSHOT + 1.2.200-SNAPSHOT eclipse-plugin 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 cecfa4fd11..4e2930cee6 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 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin Automatic-Module-Name: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin -Bundle-Version: 1.1.101.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-Vendor: %bundle.provider Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy @@ -26,5 +26,5 @@ 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" Export-Package: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin;version="1.1.1" -Require-Capability: osgi.extender; filter:=(&(osgi.extender=osgi.remoteserviceadmin) (version>=1.1) (!(version>=2.0))) +Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.remoteserviceadmin)(version>=1.1)(!(version>=2.0)))"