Skip to content

Commit

Permalink
[systeminfo] Migrate to BND (openhab#5455)
Browse files Browse the repository at this point in the history
* Migrate systeminfo to bnd
* fix dependencies, update JNA, fix tests (openhab#8)

Signed-off-by: Jan N. Klug <[email protected]>
  • Loading branch information
falkena authored and mherwege committed May 10, 2019
1 parent b22289c commit 14d76dd
Show file tree
Hide file tree
Showing 43 changed files with 231 additions and 268 deletions.
4 changes: 2 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
/addons/binding/org.openhab.binding.nikohomecontrol/ @mherwege
/addons/binding/org.openhab.binding.onkyo/ @pail23 @paulianttila
/addons/binding/org.openhab.binding.samsungtv/ @paulianttila
/addons/binding/org.openhab.binding.systeminfo/ @svilenvul
/addons/binding/org.openhab.binding.systeminfo.test/ @svilenvul
/addons/binding/org.openhab.binding.yamahareceiver/ @davidgraeff @zarusz
/addons/binding/org.openhab.binding.yamahareceiver.test/ @davidgraeff @zarusz
/addons/binding/org.openhab.binding.zoneminder/ @Mr-Eskildsen
Expand Down Expand Up @@ -162,6 +160,7 @@
/bundles/org.openhab.binding.spotify/ @Hilbrand
/bundles/org.openhab.binding.squeezebox/ @digitaldan @mhilbush
/bundles/org.openhab.binding.synopanalyzer/ @clinique
/bundles/org.openhab.binding.systeminfo/ @svilenvul
/bundles/org.openhab.binding.tado/ @dfrommi
/bundles/org.openhab.binding.tankerkoenig/ @dolic @JueBag
/bundles/org.openhab.binding.tellstick/ @jarlebh
Expand Down Expand Up @@ -213,6 +212,7 @@
/itests/org.openhab.binding.mqtt.homie.tests/ @davidgraeff
/itests/org.openhab.binding.nest.tests/ @wborn
/itests/org.openhab.binding.ntp.tests/ @marcelrv
/itests/org.openhab.binding.systeminfo.tests/ @svilenvul
/itests/org.openhab.binding.tradfri.tests/ @cweitkamp @kaikreuzer
/itests/org.openhab.binding.wemo.tests/ @hmerk
/itests/org.openhab.persistence.mapdb.tests/ @mkhl
Expand Down
7 changes: 0 additions & 7 deletions addons/binding/org.openhab.binding.systeminfo.test/.classpath

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

76 changes: 0 additions & 76 deletions addons/binding/org.openhab.binding.systeminfo.test/pom.xml

This file was deleted.

11 changes: 0 additions & 11 deletions addons/binding/org.openhab.binding.systeminfo/.classpath

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 0 additions & 16 deletions addons/binding/org.openhab.binding.systeminfo/pom.xml

This file was deleted.

2 changes: 0 additions & 2 deletions addons/binding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
<module>org.openhab.binding.nikohomecontrol</module>
<module>org.openhab.binding.onkyo</module>
<module>org.openhab.binding.samsungtv</module>
<module>org.openhab.binding.systeminfo</module>
<module>org.openhab.binding.systeminfo.test</module>
<module>org.openhab.binding.zoneminder</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion bom/openhab-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.binding</groupId>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.systeminfo</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
32 changes: 32 additions & 0 deletions bundles/org.openhab.binding.systeminfo/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,13 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
44 changes: 44 additions & 0 deletions bundles/org.openhab.binding.systeminfo/pom.xml
Original file line number Diff line number Diff line change
@@ -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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

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

<artifactId>org.openhab.binding.systeminfo</artifactId>

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

<dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>3.13.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit 14d76dd

Please sign in to comment.