moved esh addons from distro to core

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer
2016-04-22 19:33:06 +02:00
parent c6d56c74a3
commit 7e1e3de9eb
5 changed files with 128 additions and 1 deletions
@@ -84,6 +84,20 @@
<bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
</feature>
<feature name="openhab-misc-ruleengine" description="New Rule Engine" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature dependency="true">esh-automation-api</feature>
<feature dependency="true">esh-automation-commands</feature>
<feature dependency="true">esh-automation-core</feature>
<feature dependency="true">esh-automation-module-core</feature>
<feature dependency="true">esh-automation-module-script</feature>
<feature dependency="true">esh-automation-module-script-defaultscope</feature>
<feature dependency="true">esh-automation-module-timer</feature>
<feature dependency="true">esh-automation-parser-gson</feature>
<feature dependency="true">esh-automation-providers</feature>
<feature dependency="true">esh-automation-rest</feature>
</feature>
<!-- ui -->
<feature name="openhab-dashboard" description="Dashboard" version="${project.version}">
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>openhab-esh-addons</artifactId>
<packaging>feature</packaging>
<name>openHAB Feature ESH Addons</name>
<description>openHAB Feature ESH Addons</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<startLevel>80</startLevel>
<aggregateFeatures>true</aggregateFeatures>
<!-- <resolver>(obr)</resolver> -->
<checkDependencyChange>true</checkDependencyChange>
<failOnDependencyChange>false</failOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges>
<overwriteChangedDependencies>true</overwriteChangedDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<!-- binding -->
<feature name="openhab-binding-hue" description="Hue Binding" version="${esh.version}">
<feature>esh-binding-hue</feature>
</feature>
<feature name="openhab-binding-fsinternetradio" description="Frontier Silicon Internet Radio Binding" version="${esh.version}">
<feature>esh-binding-fsinternetradio</feature>
</feature>
<feature name="openhab-binding-lifx" description="LIFX Binding" version="${esh.version}">
<feature>esh-binding-lifx</feature>
</feature>
<feature name="openhab-binding-ntp" description="NTP Binding" version="${esh.version}">
<feature>esh-binding-ntp</feature>
</feature>
<feature name="openhab-binding-sonos" description="Sonos Binding" version="${esh.version}">
<feature>esh-binding-sonos</feature>
</feature>
<feature name="openhab-binding-wemo" description="Wemo Binding" version="${esh.version}">
<feature>esh-binding-wemo</feature>
</feature>
<feature name="openhab-binding-yahooweather" description="Yahoo Weather Binding" version="${esh.version}">
<feature>esh-binding-yahooweather</feature>
</feature>
<!-- transformation -->
<feature name="openhab-transformation-exec" description="Exec Transformation" version="${esh.version}">
<feature>esh-transform-exec</feature>
</feature>
<feature name="openhab-transformation-javascript" description="Javascript Transformation" version="${esh.version}">
<feature>esh-transform-javascript</feature>
</feature>
<feature name="openhab-transformation-map" description="Map Transformation" version="${esh.version}">
<feature>esh-transform-map</feature>
</feature>
<feature name="openhab-transformation-scale" description="Scale Transformation" version="${esh.version}">
<feature>esh-transform-scale</feature>
</feature>
<feature name="openhab-transformation-regex" description="RegEx Transformation" version="${esh.version}">
<feature>esh-transform-regex</feature>
</feature>
<feature name="openhab-transformation-xpath" description="XPath Transformation" version="${esh.version}">
<feature>esh-transform-xpath</feature>
</feature>
<feature name="openhab-transformation-jsonpath" description="JSONPath Transformation" version="${esh.version}">
<feature>esh-transform-jsonpath</feature>
</feature>
<feature name="openhab-transformation-xslt" description="XSLT Transformation" version="${esh.version}">
<feature>esh-transform-xslt</feature>
</feature>
</features>
+2 -1
View File
@@ -15,7 +15,8 @@
<packaging>pom</packaging>
<modules>
<module>karaf</module>
<module>openhab-core</module>
<module>openhab-esh-addons</module>
<module>verify-karaf</module>
<module>p2</module>
<module>repo</module>