Skip to content

Commit 211bc29

Browse files
authored
[karaf] Tune up openhab compatibility features. (#20)
Fix for #12. The 'openhab-runtime-base' and 'openhab-core-base' features are evicted from opensmarthouse feature set. In order to stick with these a complete 'compat' feature set must be used. A side effect of this change is change of core feature karaf namespace to 1.4.0. This is necessary to make XSLT transformation work. The downgraded (1.3.0) version of namespace was introduced to temporary disable validation of requirements/capabilities which caused troubles. Given that most of features is stable and we strip req/cap from manifest now we can re-enable validation. Signed-off-by: Łukasz Dywicki <[email protected]>
1 parent b3b83cf commit 211bc29

File tree

1 file changed

+1
-9
lines changed
  • features/karaf/opensmarthouse-core/src/main/feature

1 file changed

+1
-9
lines changed

features/karaf/opensmarthouse-core/src/main/feature/feature.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
SPDX-License-Identifier: EPL-2.0
1414
1515
-->
16-
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
16+
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
1717

1818
<repository>mvn:org.opensmarthouse.core.features.karaf/org.opensmarthouse.core.features.karaf.opensmarthouse-tp/${project.version}/xml/features</repository>
1919

@@ -98,10 +98,6 @@
9898
-->
9999
</feature>
100100

101-
<feature name="openhab-core-base">
102-
<feature>opensmarthouse-core-base</feature>
103-
</feature>
104-
105101
<feature name="opensmarthouse-core-transform" description="Open SmartHouse Core: Transform" version="${project.version}">
106102
<feature>opensmarthouse-core</feature>
107103
<feature>opensmarthouse-core-net</feature>
@@ -862,10 +858,6 @@
862858
<feature>opensmarthouse-core-io-rest-core</feature>
863859
</feature>
864860

865-
<feature name="openhab-runtime-base">
866-
<feature>opensmarthouse-runtime-base</feature>
867-
</feature>
868-
869861
<feature name="opensmarthouse-core" version="${project.version}">
870862
<bundle start-level="90">mvn:org.opensmarthouse.core.bundles/org.opensmarthouse.core/${project.version}</bundle>
871863
<feature>opensmarthouse-core-config</feature>

0 commit comments

Comments
 (0)