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

Merge pull request #3 from dvanherbergen/master

Browse Source 
Update to new ESH feature
This commit is contained in:
Kai Kreuzer 2016-01-04 19:07:12 +01:00
commit ef486cff7d
3 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,13 +12,21 @@
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> <features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}"> <feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
<feature>shk-esh-base</feature> <feature>esh-base</feature>
<feature>shk-esh-io-console-karaf</feature> <feature>esh-io-console-karaf</feature>
<bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle> <feature>esh-io-rest-sitemap</feature>
<feature>esh-model-item-runtime</feature>
<feature>esh-model-persistence-runtime</feature>
<feature>esh-model-rule-runtime</feature>
<feature>esh-model-script-runtime</feature>
<feature>esh-model-sitemap-runtime</feature>
<feature>esh-model-thing-runtime</feature>
<feature>esh-storage-mapdb</feature>
<feature>esh-ui-iconset-classic</feature>
<feature dependency="true">shell</feature> <feature dependency="true">shell</feature>
<bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${dep.karaf.version}</bundle> <bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${dep.karaf.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${dep.karaf.version}</bundle> <bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${dep.karaf.version}</bundle>
<bundle>mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
<bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle> <bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle>
</feature> </feature>
@ -40,15 +48,20 @@
<feature name="openhab-runtime-compat1x" description="Compatibility layer for openHAB 1 addons" version="${project.version}"> <feature name="openhab-runtime-compat1x" description="Compatibility layer for openHAB 1 addons" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<feature>esh-model-item</feature>
<feature>esh-model-persistence</feature>
<feature>esh-model-script</feature>
<feature>esh-model-sitemap</feature>
<feature>esh-ui</feature>
<bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle> <bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle>
</feature> </feature>
<feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}"> <feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}">
<feature>shk-esh-io-transport-mdns</feature> <feature>esh-io-transport-mdns</feature>
</feature> </feature>
<feature name="openhab-transport-mqtt" description="MQTT Transport" version="${project.version}"> <feature name="openhab-transport-mqtt" description="MQTT Transport" version="${project.version}">
<feature>shk-esh-io-transport-mqtt</feature> <feature>esh-io-transport-mqtt</feature>
</feature> </feature>
<feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}"> <feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
@ -57,11 +70,11 @@
</feature> </feature>
<feature name="openhab-transport-upnp" description="UPnP Transport" version="${project.version}"> <feature name="openhab-transport-upnp" description="UPnP Transport" version="${project.version}">
<feature>shk-esh-io-transport-upnp</feature> <feature>esh-io-transport-upnp</feature>
</feature> </feature>
<feature name="openhab-misc-restdocs" description="REST Documentation" version="${project.version}"> <feature name="openhab-misc-restdocs" description="REST Documentation" version="${project.version}">
<feature>shk-esh-base</feature> <feature>esh-base</feature>
<feature>shk-jax-rs-provider-swagger</feature> <feature>shk-jax-rs-provider-swagger</feature>
<feature>openhab-dashboard</feature> <feature>openhab-dashboard</feature>
<bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle> <bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
@ -74,14 +87,15 @@
<!-- ui --> <!-- ui -->
<feature name="openhab-dashboard" description="Dashboard" version="${project.version}"> <feature name="openhab-dashboard" description="Dashboard" version="${project.version}">
<feature>shk-esh-base</feature> <feature>esh-base</feature>
<bundle>mvn:org.openhab.core/org.openhab.ui.dashboard/${project.version}</bundle> <bundle>mvn:org.openhab.core/org.openhab.ui.dashboard/${project.version}</bundle>
</feature> </feature>
<feature name="openhab-ui-basic" description="Basic UI" version="${project.version}"> <feature name="openhab-ui-basic" description="Basic UI" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<feature>openhab-dashboard</feature> <feature>openhab-dashboard</feature>
<feature>shk-esh-ui-basic</feature> <feature>esh-ui-basic</feature>
<feature>esh-ui-icon</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.basicui/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.basicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
<config name="org.eclipse.smarthome.basicui"> <config name="org.eclipse.smarthome.basicui">
@ -93,7 +107,8 @@
<feature name="openhab-ui-classic" description="Classic UI" version="${project.version}"> <feature name="openhab-ui-classic" description="Classic UI" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<feature>openhab-dashboard</feature> <feature>openhab-dashboard</feature>
<feature>shk-esh-ui-classic</feature> <feature>esh-ui-classic</feature>
<feature>esh-ui-icon</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.classicui/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.classicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
<config name="org.eclipse.smarthome.classicui"> <config name="org.eclipse.smarthome.classicui">
@ -104,7 +119,7 @@
<feature name="openhab-ui-paper" description="Paper UI" version="${project.version}"> <feature name="openhab-ui-paper" description="Paper UI" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<feature>openhab-dashboard</feature> <feature>openhab-dashboard</feature>
<feature>shk-esh-ui-paper</feature> <feature>esh-ui-paper</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.paperui/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.paperui/${project.version}</bundle>
</feature> </feature>

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

@ -24,12 +24,20 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.maggu2810.playground.shk</groupId> <groupId>org.eclipse.smarthome</groupId>
<artifactId>shk-feature-base</artifactId> <artifactId>karaf</artifactId>
<version>1.0.3</version> <version>${esh.version}</version>
<classifier>features</classifier> <classifier>features</classifier>
<type>xml</type> <type>xml</type>
</dependency> </dependency>
<dependency>
<groupId>de.maggu2810.shk</groupId>
<artifactId>shk-feature-base</artifactId>
<version>${shk.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>openhab-core</artifactId> <artifactId>openhab-core</artifactId>
@ -65,7 +73,8 @@
<descriptors> <descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${dep.karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/framework/${dep.karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${dep.karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/standard/${dep.karaf.version}/xml/features</descriptor>
<descriptor>mvn:de.maggu2810.playground.shk/shk-feature-base/1.0.3/xml/features</descriptor> <descriptor>mvn:org.eclipse.smarthome/karaf/${esh.version}/xml/features</descriptor>
<descriptor>mvn:de.maggu2810.shk/shk-feature-base/${shk.version}/xml/features</descriptor>
<descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor> <descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>
</descriptors> </descriptors>
<distribution>org.apache.karaf.features:framework</distribution> <distribution>org.apache.karaf.features:framework</distribution>
@ -78,6 +87,7 @@
</features> </features>
<verifyTransitive>false</verifyTransitive> <verifyTransitive>false</verifyTransitive>
<ignoreMissingConditions>true</ignoreMissingConditions> <ignoreMissingConditions>true</ignoreMissingConditions>
<fail>first</fail>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

21
pom.xml
View File

@ -57,7 +57,7 @@
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion> <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
<esh.version>0.8.0-SNAPSHOT</esh.version> <esh.version>0.8.0-SNAPSHOT</esh.version>
<shk.version>1.2</shk.version>
<dep.karaf.version>4.0.3</dep.karaf.version> <dep.karaf.version>4.0.3</dep.karaf.version>
<karaf.maven.plugin.version>4.0.3</karaf.maven.plugin.version> <karaf.maven.plugin.version>4.0.3</karaf.maven.plugin.version>
<karaf.features.version>4.0.3</karaf.features.version> <karaf.features.version>4.0.3</karaf.features.version>
@ -162,6 +162,11 @@
<name>JCenter Repository</name> <name>JCenter Repository</name>
<url>https://jcenter.bintray.com/</url> <url>https://jcenter.bintray.com/</url>
</repository> </repository>
<repository>
<id>shk-bintray</id>
<name>Bintray Repository for shk</name>
<url>https://dl.bintray.com/maggu2810/maven</url>
</repository>
<repository> <repository>
<id>jfrog</id> <id>jfrog</id>
<name>JFrog OSS Repository</name> <name>JFrog OSS Repository</name>
@ -179,20 +184,6 @@
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </repository>
<repository>
<id>tmp-jaxrs-swagger</id>
<url>https://github.com/maggu2810/openhab2-mvn-repo/raw/jaxrs-swagger</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>tmp-shk</id>
<url>https://github.com/maggu2810/openhab2-mvn-repo/raw/shk</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories> </repositories>
</project> </project>