demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

updated features to latest ESH changes reg. jUPnP + Jetty HTTP Client (#228)

Browse Source 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2017-11-10 18:47:37 +01:00 committed by GitHub
parent 5be5bc8284
commit 29721e0a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@
<feature>esh-ui-icon</feature>
<feature>esh-storage-json</feature>
<feature>openhab-runtime-certificate</feature>
<feature>openhab-runtime-httpclient</feature>
<feature>openhab-transport-mdns</feature>
<feature prerequisite="true">shell</feature>
<feature prerequisite="true">wrapper</feature>
@ -45,14 +44,6 @@
</config>
</feature>
<feature name="openhab-runtime-httpclient" description="HTTP and Websocket Client" version="${project.version}">
<feature dependency="true">http</feature>
<bundle start-level="30">mvn:org.eclipse.jetty/jetty-proxy/${jetty.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}</bundle>
</feature>
<feature name="openhab-runtime-certificate" description="SSL Certificate Generator" version="${project.version}">
<bundle start-level="20">mvn:org.openhab.core/org.openhab.io.jetty.certificate/${project.version}</bundle>
</feature>
@ -65,6 +56,8 @@
<feature>esh-model-sitemap</feature>
<feature>esh-ui</feature>
<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.openhab.core/org.openhab.core.compat1x/${project.version}</bundle>
</feature>
@ -72,6 +65,10 @@
<feature>esh-io-transport-coap</feature>
</feature>
<feature name="openhab-transport-http" description="HTTP Transport" version="${project.version}">
<feature>esh-io-transport-http</feature>
</feature>
<feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}">
<feature>esh-io-transport-mdns</feature>
</feature>