Skip to content

Commit

Permalink
Merge branch 'master' into jSupla
Browse files Browse the repository at this point in the history
# Conflicts:
#	addons/binding/pom.xml
  • Loading branch information
magx2 committed May 4, 2019
2 parents 48a7fb6 + 169cd57 commit d0c9d2d
Show file tree
Hide file tree
Showing 2,396 changed files with 48,266 additions and 28,992 deletions.
93 changes: 40 additions & 53 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,58 +5,6 @@
* @openhab/2-x-add-ons-maintainers

# Add-on maintainers:
/addons/binding/org.openhab.binding.bluetooth/ @cdjackson @kaikreuzer
/addons/binding/org.openhab.binding.bluetooth.bluegiga/ @cdjackson @kaikreuzer
/addons/binding/org.openhab.binding.bluetooth.bluegiga.test/ @cdjackson @kaikreuzer
/addons/binding/org.openhab.binding.bluetooth.bluez/ @cdjackson @kaikreuzer
/addons/binding/org.openhab.binding.bluetooth.blukii/ @kaikreuzer
/addons/binding/org.openhab.binding.bluetooth.ruuvitag @ssalonen
/addons/binding/org.openhab.binding.bluetooth.test/ @cdjackson @kaikreuzer
/addons/binding/org.openhab.binding.boschindego/ @jofleck
/addons/binding/org.openhab.binding.chromecast/ @kaikreuzer
/addons/binding/org.openhab.binding.chromecast.test/ @kaikreuzer
/addons/binding/org.openhab.binding.dsmr/ @Hilbrand
/addons/binding/org.openhab.binding.dsmr.test/ @Hilbrand
/addons/binding/org.openhab.binding.enocean/ @fruggy83
/addons/binding/org.openhab.binding.exec/ @kgoderis
/addons/binding/org.openhab.binding.feed/ @svilenvul
/addons/binding/org.openhab.binding.feed.test/ @svilenvul
/addons/binding/org.openhab.binding.ftpupload/ @paulianttila
/addons/binding/org.openhab.binding.ihc/ @paulianttila
/addons/binding/org.openhab.binding.ihc.test/ @paulianttila
/addons/binding/org.openhab.binding.innogysmarthome/ @ollie-dev
/addons/binding/org.openhab.binding.lgwebos/ @sprehn
/addons/binding/org.openhab.binding.loxone/ @ppieczul
/addons/binding/org.openhab.binding.modbus/ @ssalonen
/addons/binding/org.openhab.binding.modbus.test/ @ssalonen
/addons/binding/org.openhab.binding.netatmo/ @clinique @cweitkamp @lolodomo
/addons/binding/org.openhab.binding.nikohomecontrol/ @mherwege
/addons/binding/org.openhab.binding.onewiregpio/ @aogorek
/addons/binding/org.openhab.binding.onkyo/ @pail23 @paulianttila
/addons/binding/org.openhab.binding.orvibo/ @tavalin
/addons/binding/org.openhab.binding.samsungtv/ @paulianttila
/addons/binding/org.openhab.binding.smartmeter/ @msteigenberger
/addons/binding/org.openhab.binding.smartmeter.test/ @msteigenberger
/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
/addons/io/org.openhab.io.azureiothub/ @nikotanghe
/addons/io/org.openhab.io.homekit/ @beowulfe
/addons/io/org.openhab.io.hueemulation/ @davidgraeff @digitaldan
/addons/io/org.openhab.io.hueemulation.test/ @davidgraeff @digitaldan
/addons/io/org.openhab.io.imperihome/ @pdegeus
/addons/io/org.openhab.io.javasound/ @kaikreuzer
/addons/io/org.openhab.io.mqttembeddedbroker/ @davidgraeff
/addons/io/org.openhab.io.mqttembeddedbroker.test/ @davidgraeff
/addons/io/org.openhab.io.openhabcloud/ @kaikreuzer
/addons/io/org.openhab.io.sound/ @kaikreuzer
/addons/io/org.openhab.io.transport.feed/ @svilenvul
/addons/io/org.openhab.io.transport.modbus/ @ssalonen
/addons/io/org.openhab.io.transport.modbus.test/ @ssalonen
/addons/voice/org.openhab.voice.kaldi/ @kaikreuzer
/addons/voice/org.openhab.voice.pollytts/ @hillmanr
/bundles/org.openhab.binding.airquality/ @kubawolanin
/bundles/org.openhab.binding.airvisualnode/ @3cky
/bundles/org.openhab.binding.allplay/ @dominicdesun
Expand All @@ -67,7 +15,15 @@
/bundles/org.openhab.binding.autelis/ @digitaldan
/bundles/org.openhab.binding.avmfritz/ @cweitkamp
/bundles/org.openhab.binding.bigassfan/ @mhilbush
/bundles/org.openhab.binding.bluetooth/ @cdjackson @kaikreuzer
/bundles/org.openhab.binding.bluetooth.bluegiga/ @cdjackson @kaikreuzer
/bundles/org.openhab.binding.bluetooth.bluez/ @cdjackson @kaikreuzer
/bundles/org.openhab.binding.bluetooth.blukii/ @kaikreuzer
/bundles/org.openhab.binding.bluetooth.ruuvitag @ssalonen
/bundles/org.openhab.binding.boschindego/ @jofleck
/bundles/org.openhab.binding.bosesoundtouch/ @marvkis @tratho
/bundles/org.openhab.binding.buienradar/ @gedejong
/bundles/org.openhab.binding.chromecast/ @kaikreuzer
/bundles/org.openhab.binding.cm11a/ @BobRak
/bundles/org.openhab.binding.coolmasternet/ @projectgus
/bundles/org.openhab.binding.daikin/ @caffineehacker
Expand All @@ -79,14 +35,19 @@
/bundles/org.openhab.binding.dlinksmarthome/ @MikeJMajor
/bundles/org.openhab.binding.dmx/ @J-N-K
/bundles/org.openhab.binding.dscalarm/ @RSStephens
/bundles/org.openhab.binding.dsmr/ @Hilbrand
/bundles/org.openhab.binding.dwdunwetter/ @limdul79
/bundles/org.openhab.binding.elerotransmitterstick/ @vbier
/bundles/org.openhab.binding.enocean/ @fruggy83
/bundles/org.openhab.binding.evohome/ @Nebula83
/bundles/org.openhab.binding.exec/ @kgoderis
/bundles/org.openhab.binding.feed/ @svilenvul
/bundles/org.openhab.binding.feican/ @Hilbrand
/bundles/org.openhab.binding.folding/ @fa2k
/bundles/org.openhab.binding.freebox/ @lolodomo
/bundles/org.openhab.binding.fronius/ @trokohl
/bundles/org.openhab.binding.fsinternetradio/ @paphko
/bundles/org.openhab.binding.ftpupload/ @paulianttila
/bundles/org.openhab.binding.gardena/ @gerrieg
/bundles/org.openhab.binding.globalcache/ @mhilbush
/bundles/org.openhab.binding.gpstracker/ @gbicskei
Expand All @@ -99,6 +60,8 @@
/bundles/org.openhab.binding.hue/ @cweitkamp
/bundles/org.openhab.binding.hyperion/ @tavalin
/bundles/org.openhab.binding.icloud/ @pgfeller
/bundles/org.openhab.binding.ihc/ @paulianttila
/bundles/org.openhab.binding.innogysmarthome/ @ollie-dev
/bundles/org.openhab.binding.ipp/ @peuter
/bundles/org.openhab.binding.irtrans/ @kgoderis
/bundles/org.openhab.binding.jeelink/ @vbier
Expand All @@ -111,10 +74,13 @@
/bundles/org.openhab.binding.lametrictime/ @syphr42
/bundles/org.openhab.binding.leapmotion/ @kaikreuzer
/bundles/org.openhab.binding.lgtvserial/ @fa2k
/bundles/org.openhab.binding.lgwebos/ @sprehn
/bundles/org.openhab.binding.lifx/ @wborn
/bundles/org.openhab.binding.lirc/ @kabili207
/bundles/org.openhab.binding.logreader/ @paulianttila
/bundles/org.openhab.binding.loxone/ @ppieczul
/bundles/org.openhab.binding.lutron/ @actong
/bundles/org.openhab.binding.mail/ @J-N-K
/bundles/org.openhab.binding.max/ @marcelrv
/bundles/org.openhab.binding.mcp23017/ @aogorek
/bundles/org.openhab.binding.meteoblue/ @9037568
Expand All @@ -124,6 +90,7 @@
/bundles/org.openhab.binding.miio/ @marcelrv
/bundles/org.openhab.binding.milight/ @davidgraeff
/bundles/org.openhab.binding.minecraft/ @ibaton
/bundles/org.openhab.binding.modbus/ @ssalonen
/bundles/org.openhab.binding.mqtt/ @davidgraeff
/bundles/org.openhab.binding.mqtt.generic/ @davidgraeff
/bundles/org.openhab.binding.mqtt.homeassistant/ @davidgraeff
Expand All @@ -136,14 +103,18 @@
/bundles/org.openhab.binding.network/ @davidgraeff @mettke
/bundles/org.openhab.binding.nibeheatpump/ @paulianttila
/bundles/org.openhab.binding.nibeuplink/ @alexf2015
/bundles/org.openhab.binding.nikohomecontrol/ @mherwege
/bundles/org.openhab.binding.ntp/ @marcelrv
/bundles/org.openhab.binding.nuki/ @mkatter
/bundles/org.openhab.binding.oceanic/ @kgoderis
/bundles/org.openhab.binding.onebusaway/ @sdwilsh
/bundles/org.openhab.binding.onewiregpio/ @aogorek
/bundles/org.openhab.binding.onewire/ @J-N-K
/bundles/org.openhab.binding.onkyo/ @pail23 @paulianttila
/bundles/org.openhab.binding.opensprinkler/ @CrackerStealth
/bundles/org.openhab.binding.openuv/ @clinique
/bundles/org.openhab.binding.openweathermap/ @cweitkamp
/bundles/org.openhab.binding.orvibo/ @tavalin
/bundles/org.openhab.binding.pentair/ @jsjames
/bundles/org.openhab.binding.phc/ @gnlpfjh
/bundles/org.openhab.binding.pioneeravr/ @Stratehm
Expand All @@ -157,13 +128,15 @@
/bundles/org.openhab.binding.robonect/ @reyem
/bundles/org.openhab.binding.rotelra1x/ @fa2k
/bundles/org.openhab.binding.russound/ @tmrobert8
/bundles/org.openhab.binding.samsungtv/ @paulianttila
/bundles/org.openhab.binding.satel/ @druciak
/bundles/org.openhab.binding.seneye/ @nikotanghe
/bundles/org.openhab.binding.sensebox/ @hakan42
/bundles/org.openhab.binding.serialbutton/ @kaikreuzer
/bundles/org.openhab.binding.silvercrestwifisocket/ @jmvaz
/bundles/org.openhab.binding.sleepiq/ @syphr42
/bundles/org.openhab.binding.smaenergymeter/ @monnimeter
/bundles/org.openhab.binding.smartmeter/ @msteigenberger
/bundles/org.openhab.binding.solaredge/ @alexf2015
/bundles/org.openhab.binding.solarlog/ @johannrichard
/bundles/org.openhab.binding.somfytahoma/ @octa22
Expand All @@ -172,6 +145,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 All @@ -188,13 +162,24 @@
/bundles/org.openhab.binding.wemo/ @hmerk
/bundles/org.openhab.binding.wifiled/ @rvt @xylo
/bundles/org.openhab.binding.windcentrale/ @marcelrv
/bundles/org.openhab.binding.xmltv/ @clinique
/bundles/org.openhab.binding.xmppclient/ @pavel-gololobov
/bundles/org.openhab.binding.yamahareceiver/ @davidgraeff @zarusz
/bundles/org.openhab.binding.yeelight/ @claell
/bundles/org.openhab.binding.zoneminder/ @Mr-Eskildsen
/bundles/org.openhab.binding.zway/ @pathec
/bundles/org.openhab.extensionservice.marketplace/ @kaikreuzer
/bundles/org.openhab.extensionservice.marketplace.automation/ @kaikreuzer
/bundles/org.openhab.io.azureiothub/ @nikotanghe
/bundles/org.openhab.io.homekit/ @beowulfe
/bundles/org.openhab.io.hueemulation/ @davidgraeff @digitaldan
/bundles/org.openhab.io.hueemulation.test/ @davidgraeff @digitaldan
/bundles/org.openhab.io.imperihome/ @pdegeus
/bundles/org.openhab.io.javasound/ @kaikreuzer
/bundles/org.openhab.io.mqttembeddedbroker/ @davidgraeff
/bundles/org.openhab.io.neeo/ @tmrobert8
/bundles/org.openhab.io.openhabcloud/ @kaikreuzer
/bundles/org.openhab.io.transport.modbus/ @ssalonen
/bundles/org.openhab.io.webaudio/ @kaikreuzer
/bundles/org.openhab.persistence.mapdb/ @mkhl
/bundles/org.openhab.transform.exec/ @openhab/2-x-add-ons-maintainers
Expand All @@ -210,17 +195,19 @@
/bundles/org.openhab.voice.mactts/ @kaikreuzer
/bundles/org.openhab.voice.marytts/ @kaikreuzer
/bundles/org.openhab.voice.picotts/ @FlorianSW
/bundles/org.openhab.voice.pollytts/ @hillmanr
/bundles/org.openhab.voice.voicerss/ @JochenHiller
/itests/org.openhab.binding.astro.tests/ @gerrieg
/itests/org.openhab.binding.avmfritz.tests/ @cweitkamp
/itests/org.openhab.binding.dmx.tests/ @J-N-K
/itests/org.openhab.binding.feed.tests/ @svilenvul
/itests/org.openhab.binding.hue.tests/ @cweitkamp
/itests/org.openhab.binding.max.tests/ @marcelrv
/itests/org.openhab.binding.mqtt.homeassistant.tests/ @davidgraeff
/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.onewire.tests/ @J-N-K
/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
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ You find the following repository structure:

```
.
+-- addons/ Legacy addons that are currently ported to the new buildsystem
|
+-- bom Maven buildsystem: Bill of materials
| +-- openhab-addons Lists all extensions for other repos to reference them
| +-- ... Other boms
Expand All @@ -39,7 +37,7 @@ You find the following repository structure:
| +-- org.openhab.binding.astro
| +-- ...
|
+-- features/karaf An extension usually has dependencies (at least openHAB core).
+-- features/ An extension usually has dependencies (at least openHAB core).
| | In those feature files are the dependencies for the OSGi container declared.
| +-- openhab-addons-external/src/main/feature/feature.xml
| +-- openhab-addons/src/main/feature/feature.xml
Expand All @@ -49,7 +47,6 @@ You find the following repository structure:
| +-- org.openhab.binding.avmfritz.tests
| +-- ...
|
+-- poms Maven buildsystem files
+-- src/etc Auxilary buildsystem files: The license header for automatic checks for example
+-- tools Static code analyser instructions
|
Expand Down
20 changes: 0 additions & 20 deletions addons/archetype-settings.xml

This file was deleted.

39 changes: 0 additions & 39 deletions addons/binding/create_openhab_binding_skeleton.cmd

This file was deleted.

30 changes: 0 additions & 30 deletions addons/binding/create_openhab_binding_skeleton.sh

This file was deleted.

44 changes: 0 additions & 44 deletions addons/binding/create_openhab_binding_test_skeleton.cmd

This file was deleted.

Loading

0 comments on commit d0c9d2d

Please sign in to comment.