Skip to content

Commit 8a64597

Browse files
authored
Merge branch 'openhab:main' into worlfown-markdownlinter
2 parents aaa50f2 + 0d1dcd6 commit 8a64597

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ updates:
2828
open-pull-requests-limit: 15
2929
labels:
3030
- dependencies
31+
groups:
32+
jacoco:
33+
patterns:
34+
- "*jacoco*"
3135
allow:
3236
- dependency-name: "org.apache.maven.plugins:*"
3337
- dependency-name: "org.codehaus.mojo:*"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains the official set of add-ons that are implemented on top
1111
Add-ons that got accepted in here will be maintained (e.g. adapted to new core APIs)
1212
by the [openHAB Add-on maintainers](https://github.com/orgs/openhab/teams/add-ons-maintainers).
1313

14-
To get started with binding development, follow our guidelines and tutorials over at <https://www.openhab.org/docs/developer>.
14+
To get started with add-on development, follow our guidelines and tutorials over at <https://www.openhab.org/docs/developer>.
1515

1616
If you are interested in openHAB Core development, we invite you to come by on <https://github.com/openhab/openhab-core>.
1717

@@ -76,7 +76,7 @@ mvn clean install -pl :org.openhab.binding.astro
7676

7777
If you have a binding that has dependencies that are dynamically as specified in the feature.xml you can create a `.kar` instead of a `.jar` file.
7878
A `.kar` file will include the feature.xml and when added to openHAB will load and activate any dependencies specified in the feature.xml file.
79-
To create a `.kar` file run maven with the goal `karaf:kar`:
79+
To create a `.kar` file run Maven with the goal `karaf:kar`:
8080

8181
```shell
8282
mvn clean install karaf:kar -pl :org.openhab.binding.astro
@@ -112,7 +112,7 @@ When translations are added or updated and approved in Crowdin, a pull request i
112112
Therefore translations should not be edited in the openHAB-addons repo, but only in Crowdin.
113113
Otherwise translation are overridden by the automatic process.
114114

115-
To fill the English properties file run the following maven command on an add-on:
115+
To fill the English properties file run the following Maven command on an add-on:
116116

117117
```shell
118118
mvn i18n:generate-default-translations
@@ -124,7 +124,7 @@ In some cases the command does not work, and requires the full plug-in name.
124124
In that case use:
125125

126126
```shell
127-
mvn org.openhab.core.tools:i18n-maven-plugin:3.4.0:generate-default-translations
127+
mvn org.openhab.core.tools:i18n-maven-plugin:5.0.0:generate-default-translations
128128
```
129129

130130
#### Code Quality

bundles/org.openhab.binding.freeboxos/README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ Note that the discovered thing will be setup to use only HTTP API (and not HTTPS
4848
FreeboxOS binding has the following configuration parameters:
4949

5050
| Parameter Label | Parameter ID | Description | Default |
51-
|-----------------|--------------|----------------------------------------------------------------------------| |
51+
|-----------------|--------------|----------------------------------------------------------------------------|---------|
5252
| Timeout | timeout | The timeout for reading from the API in seconds. | 10 |
53-
| Callback URL | callbackUrl | URL to use for playing notification sounds, e.g. 'http://192.168.0.2:8080' | |
53+
| Callback URL | callbackUrl | URL to use for playing notification sounds, e.g. `http://192.168.0.2:8080` | |
5454

5555
## Thing Configuration
5656

5757
### Api Bridge
5858

59-
The *api* bridge thing requires the following configuration parameters:
59+
The _api_ bridge thing requires the following configuration parameters:
6060

6161
| Parameter Label | Parameter ID | Description | Required | Default |
6262
|-------------------------------|---------------------|----------------------------------------------------------------|----------|----------------------|
@@ -68,20 +68,20 @@ The *api* bridge thing requires the following configuration parameters:
6868
| HTTPS port | httpsPort | Port to use for HTTPS access to the Freebox Api | No | 443 |
6969
| Websocket Reconnect Interval | wsReconnectInterval | Disconnection interval, in minutes- 0 disables websocket usage | No | 60 |
7070

71-
If the parameter *apiDomain* is not set, the binding will use the default address used by Free to access your Freebox Server (mafreebox.freebox.fr).
72-
The bridge thing will initialize only if a valid application token (parameter *appToken*) is filled.
71+
If the parameter _apiDomain_ is not set, the binding will use the default address used by Free to access your Freebox Server (mafreebox.freebox.fr).
72+
The bridge thing will initialize only if a valid application token (parameter _appToken_) is filled.
7373

7474
### Server Things
7575

76-
The *revolution* or *delta* thing requires the following configuration parameters:
76+
The _revolution_ or _delta_ thing requires the following configuration parameters:
7777

7878
| Parameter Label | Parameter ID | Description | Required | Default |
7979
|------------------|-----------------|--------------------------------------------------------------------------|----------|---------|
8080
| Refresh Interval | refreshInterval | The refresh interval in seconds which is used to poll the Freebox Server | No | 30 |
8181

8282
### Player Things
8383

84-
The *player* or *active-player* thing requires the following configuration parameters:
84+
The _player_ or _active-player_ thing requires the following configuration parameters:
8585

8686
| Parameter Label | Parameter ID | Description | Required | Default |
8787
|------------------|-----------------|----------------------------------------------------------------------------|----------|---------|
@@ -93,29 +93,29 @@ The *player* or *active-player* thing requires the following configuration param
9393

9494
### Phone Things
9595

96-
The *fxs* or *dect* thing requires the following configuration parameters:
96+
The _fxs_ or _dect_ thing requires the following configuration parameters:
9797

9898
| Parameter Label | Parameter ID | Description | Required | Default |
9999
|------------------|-----------------|------------------------------------------------------------------------|----------|---------|
100100
| ID | id | Id of the phone line | Yes | 1 |
101101
| Refresh Interval | refreshInterval | The refresh interval in seconds which is used to poll for phone state. | No | 30 |
102102

103-
The *call* thing requires the following configuration parameters:
103+
The _call_ thing requires the following configuration parameters:
104104

105105
| Parameter Label | Parameter ID | Description | Required | Default |
106106
|------------------|-----------------|------------------------------------------------------------------------|----------|---------|
107107
| Refresh Interval | refreshInterval | The refresh interval in seconds which is used to poll for phone calls. | No | 30 |
108108

109109
### Network Device Things
110110

111-
The *host* thing requires the following configuration parameters:
111+
The _host_ thing requires the following configuration parameters:
112112

113113
| Parameter Label | Parameter ID | Description | Required | Default |
114114
|------------------|-----------------|------------------------------------------------------------------------|----------|---------|
115115
| MAC Address | macAddress | The MAC address of the network device. | Yes | |
116116
| Refresh Interval | refreshInterval | The refresh interval in seconds which is used to poll the device. | No | 30 |
117117

118-
The *wifihost* thing requires the following configuration parameters:
118+
The _wifihost_ thing requires the following configuration parameters:
119119

120120
| Parameter Label | Parameter ID | Description | Required | Default |
121121
|------------------|-----------------|------------------------------------------------------------------------|----------|---------|
@@ -128,7 +128,7 @@ This is useful with devices, especially Apple equipment, that uses randomly gene
128128

129129
### Freeplug Thing
130130

131-
The *freeplug* thing requires the following configuration parameters:
131+
The _freeplug_ thing requires the following configuration parameters:
132132

133133
| Parameter Label | Parameter ID | Description | Required | Default |
134134
|------------------|-----------------|------------------------------------------------------------------------|----------|---------|
@@ -137,7 +137,7 @@ The *freeplug* thing requires the following configuration parameters:
137137

138138
### Repeater Thing
139139

140-
The *repeater* thing requires the following configuration parameters:
140+
The _repeater_ thing requires the following configuration parameters:
141141

142142
| Parameter Label | Parameter ID | Description | Required | Default |
143143
|------------------|-----------------|---------------------------------------------------------------------|----------|---------|
@@ -147,7 +147,7 @@ The *repeater* thing requires the following configuration parameters:
147147

148148
### Virtual Machine Thing
149149

150-
The *vm* thing requires the following configuration parameters:
150+
The _vm_ thing requires the following configuration parameters:
151151

152152
| Parameter Label | Parameter ID | Description | Required | Default |
153153
|------------------|-----------------|----------------------------------------------------------------------------|----------|---------|
@@ -157,7 +157,7 @@ The *vm* thing requires the following configuration parameters:
157157

158158
### Home Node Things
159159

160-
The *basic-shutter*, *shutter*, *kfb* or *alarm* thing requires the following configuration parameters:
160+
The _basic-shutter_, _shutter_, _kfb_ or _alarm_ thing requires the following configuration parameters:
161161

162162
| Parameter Label | Parameter ID | Description | Required | Default |
163163
|------------------|-----------------|------------------------------------------------------------------|----------|---------|
@@ -184,7 +184,7 @@ Once initialized, the thing will generate all available channels.
184184

185185
The following channels are supported:
186186

187-
| Thing Type | Channel Grpup ID | Channel ID | Item Type | Access Mode | Description |
187+
| Thing Type | Channel Group ID | Channel ID | Item Type | Access Mode | Description |
188188
|-----------------------|-------------------|----------------------|-------------------------|-------------|--------------------------------------------------------------------------------|
189189
| revolution | display | lcd-brightness | Number:Dimensionless | RW | Brightness level of the screen in percent |
190190
| revolution | display | lcd-orientation | Number | RW | Screen Orientation in degrees (0 or 90 or 180 or 270) |
@@ -243,9 +243,9 @@ The following channels are supported:
243243
| call | outgoing | duration | Number:Time | R | Last outgoing call duration in seconds |
244244
| call | outgoing | timestamp | DateTime | R | Last outgoing call creation timestamp |
245245
| call | outgoing | name | String | R | Last outgoing called name |
246-
| basic-shutter | basic-shutter#basic-shutter | RollerShutter | W | Up, stop and down commands for a RTS shutter |
246+
| basic-shutter | | basic-shutter | Rollershutter | W | Up, stop and down commands for a RTS shutter |
247247

248-
(*): any thing type amongst *active-player*, *player*, *host*, *wifihost*, *repeater* and *vm*.
248+
(*): any thing type amongst _active-player_, _player_, _host_, _wifihost_, _repeater_ and _vm_.
249249

250250
## Actions for rules
251251

bundles/org.openhab.binding.knx/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>org.jacoco</groupId>
5454
<artifactId>org.jacoco.agent</artifactId>
55-
<version>0.8.12</version>
55+
<version>0.8.13</version>
5656
<classifier>runtime</classifier>
5757
<scope>test</scope>
5858
</dependency>
@@ -92,7 +92,7 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
9292
<plugin>
9393
<groupId>org.jacoco</groupId>
9494
<artifactId>jacoco-maven-plugin</artifactId>
95-
<version>0.8.12</version>
95+
<version>0.8.13</version>
9696
<configuration>
9797
<excludes>
9898
<exclude>tuwien/auto/calimero/**/*</exclude>

bundles/org.openhab.binding.mybmw/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!-- must be on the classpath -->
2424
<groupId>org.jacoco</groupId>
2525
<artifactId>org.jacoco.agent</artifactId>
26-
<version>0.8.12</version>
26+
<version>0.8.13</version>
2727
<classifier>runtime</classifier>
2828
<scope>test</scope>
2929
</dependency>
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.jacoco</groupId>
4444
<artifactId>jacoco-maven-plugin</artifactId>
45-
<version>0.8.12</version>
45+
<version>0.8.13</version>
4646
<executions>
4747
<execution>
4848
<id>default-instrument</id>

0 commit comments

Comments
 (0)