Skip to content

Commit

Permalink
Fixed fragment host and require bundle references
Browse files Browse the repository at this point in the history
Signed-off-by: Nicola Timeus <[email protected]>
  • Loading branch information
nicolatimeus committed Jul 15, 2024
1 parent 8fff14e commit e3f8bde
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ Import-Package: javax.servlet;version="3.1.0",
org.eclipse.kura.web2.ext;version="[1.0,2.0)";resolution:=optional,
org.osgi.service.http;version="1.2.0",
org.slf4j;version="1.7.25"
Require-Bundle: com.gwt.user;bundle-version="[1.1.100,2.0.0)"
Require-Bundle: com.gwt.user;bundle-version="[2.0.0,3.0.0)"
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Native libraries for 'org.eclipse.kura.linux.usb' on ARM 64
Bundle-SymbolicName: org.eclipse.kura.linux.usb.aarch64
Bundle-Version: 2.0.0.qualifier
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[1.1.0,2.0.0)"
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[2.0.0,3.0.0)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Bundle-NativeCode: lib/linux/libEurotechLinuxUdev.so; osname=Linux; processor=aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Native libraries for 'org.eclipse.kura.linux.usb' on ARM 6 HF
Bundle-SymbolicName: org.eclipse.kura.linux.usb.armv6hf
Bundle-Version: 2.0.0.qualifier
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[1.1.0,2.0.0)"
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[2.0.0,3.0.0)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Bundle-NativeCode: lib/linux/libEurotechLinuxUdev.so; osname=Linux; processor=ARM
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Native libraries for 'org.eclipse.kura.linux.usb' on x86_64
Bundle-SymbolicName: org.eclipse.kura.linux.usb.x86_64
Bundle-Version: 2.0.0.qualifier
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[1.1.0,2.0.0)"
Fragment-Host: org.eclipse.kura.linux.usb;bundle-version="[2.0.0,3.0.0)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Bundle-NativeCode: lib/linux/libEurotechLinuxUdev.so; osname=Linux; processor=x86-64
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: Eclipse Kura
Bundle-License: Eclipse Public License v2.0
Bundle-Category: Localization
Fragment-Host: org.eclipse.kura.localization;bundle-version="[1.0,2.0)"
Fragment-Host: org.eclipse.kura.localization;bundle-version="[2.0,3.0)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Export-Package: org.eclipse.kura.localization.resources;version="1.2.0"
2 changes: 1 addition & 1 deletion kura/org.eclipse.kura.web2.ext/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Bundle-Vendor: Eclipse Kura
Bundle-License: Eclipse Public License v2.0
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Bundle-ActivationPolicy: lazy
Require-Bundle: com.gwt.user;bundle-version="[1.0.0,2.0.0)"
Require-Bundle: com.gwt.user;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.kura.web2.ext;version="1.0.0"
2 changes: 1 addition & 1 deletion kura/org.eclipse.kura.web2/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ Import-Package: com.eclipsesource.json;version="0.9.5",
org.slf4j;version="1.6.4",
org.w3c.dom,
org.xml.sax
Require-Bundle: com.gwt.user;bundle-version="[1.1.0,2.0.0)"
Require-Bundle: com.gwt.user;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.kura.web.api;version="1.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ Import-Package: org.eclipse.kura.core.testutil.service;version="1.0.0",
org.mockito.stubbing;version="[4.0,5.0)",
org.osgi.util.tracker;version="[1.5,2.0)"
Require-Bundle: moquette-broker;bundle-version="1.0.0",
org.eclipse.kura.emulator;bundle-version="[0.7.1,2.0.0)",
org.eclipse.kura.emulator;bundle-version="[0.7.1,3.0.0)",
org.eclipse.equinox.io;bundle-version="1.0.400"
4 changes: 2 additions & 2 deletions kura/test/org.eclipse.kura.core.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Bundle-ActivationPolicy: lazy
Comment: org.eclipse.kura.emulator is needed as we need to start-up the emulator to run the tests!!
Require-Bundle: org.eclipse.equinox.io;bundle-version="1.0.400",
org.junit;bundle-version="4.10.0",
org.eclipse.kura.test;bundle-version="[5.0,6.0)",
org.eclipse.kura.emulator;bundle-version="[0.7.1,2.0.0)",
org.eclipse.kura.test;bundle-version="[6.0,7.0)",
org.eclipse.kura.emulator;bundle-version="[0.7.1,3.0.0)",
moquette-broker,
org.eclipse.kura.broker.artemis.xml;bundle-version="1.1.0"
Comment2: require moquette-broker. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=485926
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ Import-Package: org.eclipse.kura.configuration.metatype;version="[1.1,2.0)",
org.mockito.invocation;version="[4.0.0,5.0.0)",
org.mockito.stubbing;version="[4.0.0,5.0.0)",
org.slf4j;version="1.7.21"
Fragment-Host: org.eclipse.kura.driver.helper.provider;bundle-version="[1.0,2.0)"
Fragment-Host: org.eclipse.kura.driver.helper.provider;bundle-version="[2.0,3.0)"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.kura.json.marshaller.unmarshaller.provider.test
Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: Eclipse Kura
Bundle-License: Eclipse Public License v2.0
Fragment-Host: org.eclipse.kura.json.marshaller.unmarshaller.provider;bundle-version="[1.0,2.0)"
Fragment-Host: org.eclipse.kura.json.marshaller.unmarshaller.provider;bundle-version="[2.0,3.0)"
Bundle-ActivationPolicy: lazy
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Import-Package: org.eclipse.kura.configuration;version="[1.1,2.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.kura.xml.marshaller.unmarshaller.provider.test
Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: Eclipse Kura
Bundle-License: Eclipse Public License v2.0
Fragment-Host: org.eclipse.kura.xml.marshaller.unmarshaller.provider;bundle-version="[1.0,2.0)"
Fragment-Host: org.eclipse.kura.xml.marshaller.unmarshaller.provider;bundle-version="[2.0,3.0)"
Bundle-ActivationPolicy: lazy
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Import-Package: org.eclipse.kura;version="[1.4,2.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<Bundle-NativeCode>
lib/libhidapi.so; osname=Linux; processor=AARCH64
</Bundle-NativeCode>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[1.1.3,2.0.0)"</Fragment-Host>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<Bundle-NativeCode>
lib/libhidapi.so; osname=Linux; processor=ARM
</Bundle-NativeCode>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[1.1.3,2.0.0)"</Fragment-Host>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<Bundle-NativeCode>
lib/libhidapi.so; osname=Linux; processor=x86-64
</Bundle-NativeCode>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[1.1.3,2.0.0)"</Fragment-Host>
<Fragment-Host>com.codeminders.hidapi;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Bundle-NativeCode>
lib/libdkcomm.so; osname=Linux; processor=aarch64
</Bundle-NativeCode>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[1.2.4,2.0.0)"</Fragment-Host>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<Bundle-NativeCode>
lib/libdkcomm.so; osname=Linux; processor=ARM
</Bundle-NativeCode>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[1.2.4,2.0.0)"</Fragment-Host>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Bundle-NativeCode>
lib/libdkcomm.so; osname=Linux; processor=x86-64
</Bundle-NativeCode>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[1.2.4,2.0.0)"</Fragment-Host>
<Fragment-Host>org.eclipse.soda.dk.comm;bundle-version="[2.0.0,3.0.0)"</Fragment-Host>
</instructions>
</configuration>
</plugin>
Expand Down

0 comments on commit e3f8bde

Please sign in to comment.