demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

add jackson 1.x to compat1x feature (#616)

Browse Source 
Fixes: https://github.com/openhab/openhab-core/issues/614

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2019-03-01 14:31:17 +00:00 committed by Kai Kreuzer
parent 2a06d15955
commit 58d73f9f5c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -518,7 +518,7 @@
<bundle>mvn:p2.osgi.bundle/com.google.gson/2.8.2.v20180104-1110</bundle>
<bundle>mvn:com.google.guava/guava/18.0</bundle>
<requirement>openhab.tp;filter:="(feature=commons-net)"</requirement>
<feature dependency="true">openhab.tp-commons-net</feature>
<feature dependency="true">openhab.tp-commons-net</feature>
<feature>openhab-core-base</feature>
<feature>openhab-core-io-console-karaf</feature>
<feature>openhab-core-io-rest-sitemap</feature>
@ -539,8 +539,8 @@
<feature prerequisite="true">shell</feature>
<feature prerequisite="true">wrapper</feature>
<!-- This bundle needs to be started early as it registers the 404 and startup pages on Jetty -->
<!-- It is temperarily disabled due to https://github.com/openhab/openhab-core/issues/422
<bundle start-level="30">mvn:org.openhab.core.bundles/org.openhab.ui.start/${project.version}</bundle> -->
<!-- It is temperarily disabled due to https://github.com/openhab/openhab-core/issues/422 -->
<!-- <bundle start-level="30">mvn:org.openhab.core.bundles/org.openhab.ui.start/${project.version}</bundle> -->
<bundle start-level="90">mvn:org.openhab.core.bundles/org.openhab.core.boot/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/${project.version}</bundle>
<config name="org.eclipse.smarthome.audio">
@ -567,10 +567,17 @@
<feature>openhab-core-model-script</feature>
<feature>openhab-core-model-sitemap</feature>
<feature>openhab-core-ui</feature>
<!-- Allow to add external dependencies here instead in the target platform. -->
<!-- The compat1x feature is a special one to get old OH1 running. -->
<!-- We do not want to pollute the normal target platform with such legacy dependencies. -->
<bundle dependency="true">mvn:commons-net/commons-net/3.3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/3.1_7</bundle>
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.2.3</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.2.3</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.2</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.2</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.compat1x/${project.version}</bundle>
</feature>