Commit Graph

43 Commits

Author SHA1 Message Date
Wouter Born
9aa72abd82
Resolve runbundles and fix tests (#14588)
Related to:

* openhab/openhab-core#3433
* openhab/openhab-core#3446
* openhab/openhab-core#3450

Some tests were updated because private lifecycle methods (annotated with @BeforeAll, @AfterAll, @BeforeEach, or @AfterEach) now lead to an exception.

See: https://junit.org/junit5/docs/current/release-notes/index.html#deprecations-and-breaking-changes-3

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-12 23:00:58 +01:00
Wouter Born
c7f7dbdc07
Resolve itest runbundles for JUPnP upgrade (#14538)
Related to openhab/openhab-core#3421

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-05 13:12:49 +01:00
Wouter Born
b2bf7256db
Upgrade to Karaf 4.4.3 (#14040)
* Rework Servlets to use Http Whiteboard annotations in favor of proprietary `org.openhab.core.io.http.servlet` classes
* Resolve itest runbundles
* Fix dependency issues
* Catch proper exception when starting hueemulation UpnpServer

Also-by: Jan N. Klug <github@klug.nrw>
Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-01 18:33:50 +01:00
J-N-K
ec3f5369be
Resolve itests after core changes (#14498)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-25 12:37:37 +01:00
J-N-K
d613641bbd
Adapt addons to core watch service changes (#14004)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-13 16:37:57 +01:00
J-N-K
5f8214f08a
Adapt to core changes (addon.xml) (#13289)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-15 20:31:42 +01:00
J-N-K
cd9e1b0590
Fix build / Resolve itests (#14018)
* Fix build / Resolve itests
* Remove Java 11 from GHA matrix

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-20 08:11:31 +01:00
J-N-K
4d6d6443ef
fix spotless after release (#14014)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 15:22:17 +01:00
J-N-K
61b5c26b58
Upgrade bnd to 6.4.0 (#13890)
* Upgrade bnd to 6.4.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-09 21:23:53 +01:00
Kai Kreuzer
440f603e88
Apply spotless and resolver (#13027)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2022-06-27 16:00:37 +02:00
Wouter Born
e4a3a43345
Update bnd to 6.3.0 (#12864)
For release notes, see:

https://github.com/bndtools/bnd/wiki/Changes-in-6.3.0

Related to openhab/openhab-core#2991

Signed-off-by: Wouter Born <github@maindrain.net>
2022-06-02 21:44:20 +02:00
J-N-K
87023da9e3
Fix issues with tests after core-changes (#12817)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-05-27 09:07:15 +02:00
Wouter Born
1408899ed3
Upgrade to Karaf 4.3.7 (#12660)
* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2022-04-28 22:03:04 +02:00
J-N-K
ce6ef25ac3
bump compiler tooling (#12465)
This brings the build tools to the same versions as in core.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-03-12 22:24:38 +01:00
Wouter Born
52c21a35a3
Resolve runbundles for Xtext upgrade (#12385)
Depends on openhab/openhab-core#2786

Signed-off-by: Wouter Born <github@maindrain.net>
2022-03-05 15:19:52 +01:00
Wouter Born
144cb11243
Resolve runbundles for XStream upgrade (#12222)
Signed-off-by: Wouter Born <github@maindrain.net>
2022-02-07 08:25:16 +01:00
Wouter Born
b0765271d3
Upgrade to Karaf 4.3.6 (#12058)
* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2022-01-16 14:25:19 +01:00
Christoph Weitkamp
0f2d9367e4
Resolve itest runbundles for snapshot 3.3.0 (#11819)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2021-12-20 08:10:52 +01:00
Wouter Born
a490f0626c
Upgrade to Karaf 4.3.4 (#11750)
* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-18 13:01:38 +01:00
Wouter Born
a45b40d6c3
Update bnd to 6.1.0 (#11650)
For release notes, see:

https://github.com/bndtools/bnd/wiki/Changes-in-6.1.0

Related to openhab/openhab-core#2583

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-28 21:58:08 +01:00
Wouter Born
e223c599c0
Resolve runbundles for JUnit and Mockito dependency upgrades (#11617)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-23 23:05:09 +01:00
Wouter Born
926240770b
Resolve runbundles for UoM dependency upgrades (#11610)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-21 12:40:56 +01:00
Wouter Born
5132d939c6
Update bnd to 6.0.0 (#11359)
For release notes, see:

https://github.com/bndtools/bnd/wiki/Changes-in-6.0.0

Related to openhab/openhab-core#2514

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-09 19:57:33 +02:00
Wouter Born
4aa1f14600
Upgrade to Karaf 4.3.3 (#11261)
* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-09-18 19:33:18 +02:00
Wouter Born
088e2f08ab
Resolve runbundles for XStream upgrade (#11236)
Related to openhab/openhab-core#2482

Signed-off-by: Wouter Born <github@maindrain.net>
2021-09-12 11:44:58 +02:00
Christoph Weitkamp
2cc08ba8bd
Resolve itest runbundles for snapshot 3.2.0 (#10909)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2021-06-28 13:44:38 +02:00
Wouter Born
27d5bb11c7
Resolve itest runbundles for XStream upgrade (#10713)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-21 07:34:47 +02:00
Wouter Born
7d2c8755eb
Upgrade to Karaf 4.3.2 (#10693)
* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-18 07:37:57 +02:00
Wouter Born
c3a6aa5814
Upgrade Units of Measurement dependencies (#10583)
* Fix code/tests for upgrade
* Resolve runbundles
* Update Checkstyle ruleset for changed packages

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-11 08:31:03 +02:00
Sami Salonen
265fd30ba1
[modbus] Gain-offset profile (QuantityType support) and writing of individual bits of holding registers (#9980)
* [modbus] gainOffset and bitMask profiles for working with modbus data

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] README trailing whitespaces

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] README and some final renaming

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] log error with incompatible units

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] gainOffset profile: test for incompatible unit

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] example renamed

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Remove unused fields

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] gainOffset profile: make configuration parameters optional

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] xml indentantion fix

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] static code analysis fixes

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Minor fixes for null checking

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] remove comment

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] bit profile README disclaimer with many commands

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Grammar fixes in README

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Fix bit profile UI configuration

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Bit profile: Added possibility to invert value on read/write

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] fix typo with explanation of inverted

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] bit profile: unit tests for inverted parameter

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] spotless:apply

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] static checker fixes

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] write bit feature in data thing

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* wip

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] resolve itest

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] fixes

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Remove bit profile

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Fix data thing readStart validation

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] readme fix

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Remove bit profile test

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Invalidate REFRESH data cache with cacheful writes

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] cleanup

- abort if command is not convertible to 0/1 (previously wrote the
  cached data)
- fail fast conditionals instead of deep if's

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] README Fix typo in example

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] fix data thing write when child of endpoint

Also added regression test

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* Update bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/config/gainOffset.xml

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>

* [modbus] performance-optimized logging

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] README: Removing xtend syntax hint, not needed anymore

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] generics typing added

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] dead code

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] avoid supressing generic type warnings

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] unnecessary generics

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] rename type parameter name

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] QU (short for quantity output) generic type instead of Q2

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] Remove unused localization

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] profile constant visibility harmonized

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] spotless:apply

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>
2021-04-16 22:59:55 +02:00
Wouter Born
260d6ba083
Upgrade Karaf to 4.3.1 (#10424)
* Upgrades Karaf to 4.3.1
* Uses Pax Logging as runtime dependency instead of Felix Log
  To change the log level in itests, change the value of org.ops4j.pax.logging.DefaultServiceLog.level in itest-include.bndrun
* Adds --add-opens and nashorn.args in itest-include.bndrun to prevent some warnings being logged in itests

Related to openhab/openhab-distro#1167

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-02 20:00:30 +02:00
Wouter Born
580f293766
Resolve itest runbundles for Gson and Commons Lang upgrades and fix JsonParser deprecations (#10345)
* Resolve itest runbundles for Gson and Commons Lang upgrades
* Fix JsonParser deprecations too
* Fix feature verification

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-18 12:15:15 +01:00
Wouter Born
9c112a9a1d
Update bnd to 5.3.0 (#10257)
See: https://github.com/bndtools/bnd/wiki/Changes-in-5.3.0

Related to https://github.com/openhab/openhab-core/pull/2217

Signed-off-by: Wouter Born <github@maindrain.net>
2021-02-28 21:33:41 +01:00
Sami Salonen
fbf55d5886
[modbus] fix defaults for tcp and serial things and some other minor cleanup (#10147)
* [modbus] More strict nullness. Remove apache.commons.lang from itests
* [modbus] Defaults for tcp and serial things according to docs
* [modbus] further explicit defaults
* [modbus] document default encoding for serial.
RTU is pretty much the only one used in the field.
Previous default was ascii implicitly.
* [modbus] verify defaults are used for undefined configuration parameters

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2021-02-17 11:41:40 +01:00
Wouter Born
59dffd03a4
Resolve itests for BOM changes (#9828)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-15 22:09:59 +01:00
Wouter Born
0816045a59
Update Mockito, JUnit and use MockitoExtensions in itests (#9702)
* Updates Mockito to 3.7.0
* Updates JUnit to 5.7.0
* Use MockitoExtensions where possible

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-06 14:30:40 +01:00
Wouter Born
075b7265c0
Resolve itest runbundles for XStream 1.4.15 (#9489)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-24 00:58:48 +01:00
Wouter Born
ecac667258
Apply Spotless, update skeleton project version, resolve itest runbundles (#9459)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-22 10:37:44 +01:00
Kai Kreuzer
f152a58a31
[modbus] Moved modbus transport from addons to core (#9268)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-12-09 00:12:43 +01:00
Wouter Born
be7e9c9680
Configure XStream security and resolve itest bundles (#8663)
* Configures XStream security to prevent "Security framework of XStream not initialized, XStream is probably vulnerable" warnings.
* Resolves the itest bundles for the upgrade to XStream 1.4.13

Related to openhab/openhab-core#1688

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-04 22:10:04 +02:00
Wouter Born
d42efe0b22
Upgrade Maven compiler and fix/upgrade some TP dependencies (#8636)
Upgrades the compiler and its dependencies so the compiler results of Maven builds are more similar to those generated in recent Eclipse versions.

To fix compilation issues in Eclipse for add-ons using classes from javax.xml.stream several dependencies were upgraded/excluded.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-03 18:23:16 +02:00
Wouter Born
c82f6c4e77
Fix and reenable more integration tests (#8535)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-22 08:19:04 +02:00
Kai Kreuzer
6df6783b60 added migrated 2.x add-ons
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-09-21 03:37:19 +02:00