Skip to content

Commit d7f9af5

Browse files
core.model.{rule,script}/bnd.bnd: reorder packages alphabetically (#5339)
So that both files can easily be compared.
1 parent d6bcafb commit d7f9af5

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

  • bundles
    • org.openhab.core.model.rule
    • org.openhab.core.model.script

bundles/org.openhab.core.model.rule/bnd.bnd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Export-Package: org.openhab.core.model.rule,\
1212
org.openhab.core.model.rule.services,\
1313
org.openhab.core.model.rule.validation
1414
Import-Package: \
15+
org.openhab.core.automation.module.script.rulesupport.shared,\
1516
org.openhab.core.common,\
1617
org.openhab.core.common.registry,\
1718
org.openhab.core.events,\
@@ -20,18 +21,17 @@ Import-Package: \
2021
org.openhab.core.library.items,\
2122
org.openhab.core.library.types,\
2223
org.openhab.core.library.unit,\
24+
org.openhab.core.model.core,\
25+
org.openhab.core.model.items,\
26+
org.openhab.core.model.script,\
27+
org.openhab.core.model.script.engine.action,\
2328
org.openhab.core.persistence,\
2429
org.openhab.core.persistence.extensions,\
2530
org.openhab.core.service,\
2631
org.openhab.core.thing,\
2732
org.openhab.core.thing.binding,\
2833
org.openhab.core.thing.events,\
2934
org.openhab.core.types,\
30-
org.openhab.core.model.core,\
31-
org.openhab.core.model.items,\
32-
org.openhab.core.model.script,\
33-
org.openhab.core.model.script.engine.action,\
34-
org.openhab.core.automation.module.script.rulesupport.shared,\
3535
com.google.common.base;version="14",\
3636
javax.measure,\
3737
javax.measure.quantity,\
@@ -45,10 +45,10 @@ Require-Bundle: org.antlr.runtime,\
4545
org.eclipse.emf.mwe2.launch;resolution:=optional,\
4646
org.openhab.core.model.item,\
4747
org.openhab.core.model.script,\
48+
org.eclipse.xtext;visibility:=reexport,\
4849
org.eclipse.xtext.common.types,\
49-
org.eclipse.xtext.xtext.generator;resolution:=optional,\
5050
org.eclipse.xtext.util,\
5151
org.eclipse.xtext.xbase,\
5252
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\
53-
org.eclipse.xtext;visibility:=reexport,\
53+
org.eclipse.xtext.xtext.generator;resolution:=optional,\
5454
org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional

bundles/org.openhab.core.model.script/bnd.bnd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ Export-Package: org.openhab.core.model.script,\
1919
org.openhab.core.model.script.validation
2020
Import-Package: \
2121
org.openhab.core.audio,\
22-
org.openhab.core.common.registry,\
2322
org.openhab.core.automation.module.script.action,\
2423
org.openhab.core.automation.module.script.rulesupport.shared,\
24+
org.openhab.core.common.registry,\
2525
org.openhab.core.ephemeris,\
2626
org.openhab.core.events,\
27+
org.openhab.core.io.console,\
28+
org.openhab.core.io.console.extensions,\
29+
org.openhab.core.io.net.exec,\
30+
org.openhab.core.io.net.http,\
2731
org.openhab.core.items,\
2832
org.openhab.core.items.events,\
2933
org.openhab.core.library.items,\
3034
org.openhab.core.library.types,\
3135
org.openhab.core.library.unit,\
36+
org.openhab.core.model.core,\
3237
org.openhab.core.persistence,\
3338
org.openhab.core.persistence.extensions,\
3439
org.openhab.core.scheduler,\
@@ -42,11 +47,6 @@ Import-Package: \
4247
org.openhab.core.util,\
4348
org.openhab.core.voice,\
4449
org.openhab.core.voice.text,\
45-
org.openhab.core.io.console,\
46-
org.openhab.core.io.console.extensions,\
47-
org.openhab.core.io.net.exec,\
48-
org.openhab.core.io.net.http,\
49-
org.openhab.core.model.core,\
5050
com.google.common.*;version="14",\
5151
javax.measure,\
5252
javax.measure.quantity,\
@@ -61,11 +61,11 @@ Require-Bundle: org.antlr.runtime,\
6161
org.eclipse.emf.ecore,\
6262
org.eclipse.emf.mwe2.launch;resolution:=optional,\
6363
org.openhab.core.model.item,\
64+
org.eclipse.xtext;visibility:=reexport,\
6465
org.eclipse.xtext.common.types,\
65-
org.eclipse.xtext.xtext.generator;resolution:=optional,\
6666
org.eclipse.xtext.util,\
67-
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\
6867
org.eclipse.xtext.xbase;visibility:=reexport,\
69-
org.eclipse.xtext;visibility:=reexport,\
68+
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\
69+
org.eclipse.xtext.xtext.generator;resolution:=optional,\
7070
org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional
7171
-includeresource: resources

0 commit comments

Comments
 (0)