Skip to content

Commit

Permalink
Merge pull request #68 from scottslewis/issue-67a
Browse files Browse the repository at this point in the history
Fix for #67
  • Loading branch information
scottslewis authored Sep 5, 2023
2 parents 9264db2 + f140ea1 commit e501cc4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)))"

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>com.mycorp.examples.timeservice.consumer.filediscovery.rest</artifactId>
<version>1.2.102-SNAPSHOT</version>
<version>1.2.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Original file line number Diff line number Diff line change
Expand Up @@ -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)))"

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>com.mycorp.examples.timeservice.consumer.filediscovery</artifactId>
<version>1.2.103-SNAPSHOT</version>
<version>1.2.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)))"

0 comments on commit e501cc4

Please sign in to comment.