Skip to content

Commit

Permalink
openhab#8 Migrate supla addon to new build system
Browse files Browse the repository at this point in the history
  • Loading branch information
magx2 committed May 5, 2019
1 parent 3f6fc43 commit 50e6a9e
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 134 deletions.
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
/bundles/org.openhab.binding.sonyaudio/ @freke
/bundles/org.openhab.binding.spotify/ @Hilbrand
/bundles/org.openhab.binding.squeezebox/ @digitaldan @mhilbush
/bundles/org.openhab.binding.supla/ @magx2
/bundles/org.openhab.binding.synopanalyzer/ @clinique
/bundles/org.openhab.binding.systeminfo/ @svilenvul
/bundles/org.openhab.binding.tado/ @dfrommi
Expand Down
57 changes: 0 additions & 57 deletions addons/binding/pom.xml

This file was deleted.

5 changes: 5 additions & 0 deletions bom/openhab-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.supla</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.extensionservice.marketplace</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 0 additions & 2 deletions bundles/org.openhab.binding.supla/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="lib" path="lib/nettyServer-fat-0.9.15.jar"/>
<classpathentry kind="lib" path="lib/swagger-java-client-fat-2.0.2.jar"/>
</classpath>
61 changes: 0 additions & 61 deletions bundles/org.openhab.binding.supla/META-INF/MANIFEST.MF

This file was deleted.

1 change: 0 additions & 1 deletion bundles/org.openhab.binding.supla/OSGI-INF/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions bundles/org.openhab.binding.supla/build.properties

This file was deleted.

Binary file not shown.
Binary file not shown.
36 changes: 32 additions & 4 deletions bundles/org.openhab.binding.supla/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,42 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>pom</artifactId>
<groupId>org.openhab.binding</groupId>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
<version>2.5.0-SNAPSHOT</version>
</parent>

<artifactId>org.openhab.binding.supla</artifactId>
<packaging>eclipse-plugin</packaging>

<name>Supla Binding</name>
<name>openHAB Add-ons :: Bundles :: Supla Binding</name>

<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-big-boy-bigboy</id>
<name>bintray</name>
<url>https://dl.bintray.com/big-boy/bigboy</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>pl.grzeslowski.jsupla.api</groupId>
<artifactId>swagger-java-client</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>pl.grzeslowski.jSupla</groupId>
<artifactId>nettyServer</artifactId>
<version>0.9.14</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.1-jre</version>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<module>org.openhab.binding.sonyaudio</module>
<module>org.openhab.binding.spotify</module>
<module>org.openhab.binding.squeezebox</module>
<module>org.openhab.binding.supla</module>
<module>org.openhab.binding.synopanalyzer</module>
<module>org.openhab.binding.systeminfo</module>
<module>org.openhab.binding.tado</module>
Expand Down
9 changes: 9 additions & 0 deletions features/openhab-addons/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,15 @@
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zway/${project.version}</bundle>
</feature>

<feature name="openhab-binding-supla" description="Supla Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature prerequisite="true">wrap</feature>
<bundle dependency="true">wrap:mvn:pl.grzeslowski.jsupla.api/swagger-java-client/2.0.2</bundle>
<bundle dependency="true">wrap:mvn:pl.grzeslowski.jSupla/nettyServer/0.9.14</bundle>
<bundle dependency="true">wrap:mvn:com.google.guava/guava/27.1-jre</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zway/${project.version}</bundle>
</feature>

<!-- io -->

<feature name="openhab-transport-modbus" description="Modbus Transport" version="${project.version}">
Expand Down

0 comments on commit 50e6a9e

Please sign in to comment.