OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from maggu2810/karaf-features 

use ESH Karaf target platform
pull/38/head
Kai Kreuzer 2016-04-18 11:47:51 +02:00
parent be3a691e39 f3696aa823
commit c6d56c74a3
2 changed files with 9 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
features/karaf/src/main/feature/feature.xml
View File

@ -11,70 +11,6 @@
-->
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<repository>mvn:de.maggu2810.kat.features/apache-commons/${kat.version}/xml/features</repository>
<repository>mvn:de.maggu2810.kat.features/gson/${kat.version}/xml/features</repository>
<repository>mvn:de.maggu2810.kat.features/jmdns/${kat.version}/xml/features</repository>
<repository>mvn:de.maggu2810.kat.features/jupnp/${kat.version}/xml/features</repository>
<repository>mvn:de.maggu2810.kat.features/paho/${kat.version}/xml/features</repository>
<repository>mvn:de.maggu2810.kat.features/xtext/${kat.version}/xml/features</repository>
<feature name="shk-jax-rs-min" version="5.3">
<feature dependency="true">http</feature>
<bundle dependency="true">mvn:com.eclipsesource.jaxrs/jersey-min/2.22.1</bundle>
<bundle>mvn:com.eclipsesource.jaxrs/publisher/5.3</bundle>
</feature>
<feature name="shk-jax-rs-provider-gson" version="2.3">
<feature dependency="true" version="[5.3,5.4)">shk-jax-rs-min</feature>
<feature dependency="true" version="[2.3,2.4)">kat-gson</feature>
<bundle>mvn:com.eclipsesource.jaxrs/provider-gson/2.3</bundle>
</feature>
<feature name="shk-jax-rs-provider-swagger" version="1.0.sp1">
<feature dependency="true" version="[5.3,5.4)">shk-jax-rs-min</feature>
<bundle>mvn:de.maggu2810.thirdparty.modified.com.eclipsesource.jaxrs/swagger-all/1.5.5.sp1</bundle>
<bundle>mvn:com.eclipsesource.jaxrs/provider-swagger/1.1</bundle>
</feature>
<feature name="esh-tp-base" description="TargetPlatform Base" version="${project.version}">
<feature>eventadmin</feature>
<feature>scr</feature>
<feature>shk-jax-rs-min</feature>
<feature>shk-jax-rs-provider-gson</feature>
<feature>shk-jax-rs-provider-swagger</feature>
<bundle>mvn:io.swagger/swagger-annotations/1.5.5</bundle>
</feature>
<feature name="esh-tp-commons" version="${project.version}">
<feature dependency="true">kat-apache-commons-codec</feature>
<feature dependency="true">kat-apache-commons-collections</feature>
<feature dependency="true">kat-apache-commons-exec</feature>
<feature dependency="true">kat-apache-commons-httpclient</feature>
<feature dependency="true">kat-apache-commons-io</feature>
<feature dependency="true">kat-apache-commons-lang</feature>
<feature dependency="true">kat-apache-commons-net</feature>
</feature>
<feature name="esh-tp-jupnp" version="${project.version}">
<feature version="[2.2.0,3)">kat-jupnp</feature>
<capability>esh.tp;feature=jupnp</capability>
</feature>
<feature name="esh-tp-jmdns" version="${project.version}">
<feature version="[3.5.0,4)">kat-jmdns</feature>
<capability>esh.tp;feature=jmdns</capability>
</feature>
<feature name="esh-tp-paho" version="${project.version}">
<feature>kat-paho-client-mqttv3</feature>
<capability>esh.tp;feature=paho</capability>
</feature>
<feature name="esh-tp-xtext" version="${project.version}">
<feature version="[2.9.2,2.9.3)">kat-xtext</feature>
<capability>esh.tp;feature=xtext;version=2.9.2</capability>
</feature>
<feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
<feature>esh-base</feature>
<feature>esh-io-console-karaf</feature>
@ -143,7 +79,7 @@
<feature name="openhab-misc-restdocs" description="REST Documentation" version="${project.version}">
<feature>esh-base</feature>
<feature>shk-jax-rs-provider-swagger</feature>
<requirement>esh.tp;filter:="(feature=jax-rs-provider-swagger)"</requirement>
<feature>openhab-dashboard</feature>
<bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
</feature>

1
features/verify-karaf/pom.xml
View File

@ -66,6 +66,7 @@
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.eclipse.smarthome/karaf/${esh.version}/xml/features</descriptor>
<descriptor>mvn:org.eclipse.smarthome/karaf-tp/${esh.version}/xml/features</descriptor>
<descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>