Commit Graph
129 Commits
Author SHA1 Message Date
Wouter BornandGitHub b285e9be8f Upgrade to Karaf 4.3.4 (#2603)
* Syncs dependencies with Karaf 4.3.4
* Resolves itest runbundles for these new dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-18 10:59:35 +01:00
Wouter BornandGitHub 0028a3c792 Downgrade Aries JAX-RS Whiteboard from 2.0.1 to 2.0.0 (#2599)
It causes unneccessary bundle refreshes whenever add-ons are installed/uninstalled.
As a result the UI does not get properly notified of installation changes.

Fixes #2580
Reverts the Aries JAX-RS Whiteboard upgrade of #2532

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-10 23:34:01 +01:00
Wouter BornandGitHub 66c391a2c1 Upgrade JUnit and Mockito dependencies (#2574)
Upgrades:

* JUnit from 5.7.0 to 5.8.1.
* Mockito from 3.7.0 to 4.1.0.

For release notes, see:

* https://junit.org/junit5/docs/current/release-notes/index.html
* https://github.com/mockito/mockito/releases

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-23 20:27:17 +01:00
Wouter BornandGitHub 3d722ec13b Upgrade UoM dependencies (#2573)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-21 10:27:20 +01:00
Wouter BornandGitHub 54cd303b57 Update Jackson to 2.12.5 (#2572)
Updates Jackson from 2.12.3 to 2.12.5.

For all bug fixes, see:

* https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12.4
* https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12.5

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-21 10:19:03 +01:00
Wouter BornandGitHub f9d201c35b Use POM packaging with index BOMs (#2561)
Looks like only the POM dependencies are used by the indexer, so the JAR is unused and useless as this warning correctly indicates when you build them:

```
[WARNING] JAR will be empty - no content was marked for inclusion!
```

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-15 21:14:18 +01:00
Wouter BornandGitHub 917e268e68 [discovery] Add ser2net mDNS USB serial discovery (#2519)
* Add ser2net mDNS USB serial discovery

* Add support for using multiple UsbSerialDiscovery services
* Add Ser2NetUsbSerialDiscovery that can use mDNS to discover ser2net RFC2217 serial ports
* Use discovered USB ports in SerialConfigOptionProvider

mDNS discovery is supported in ser2net 4.3.0 and newer.
E.g. you can install a ser2net version that provides this using APT in Ubuntu 21.04 and Debian 11.

Example ser2net YAML configuration that allows a serial port to be discovered using mDNS discovery:

%YAML 1.1
---
connection: &con01
  accepter: telnet(rfc2217),tcp,2222
  connector: serialdev,/dev/ttyUSB0
  options:
    mdns: true
    mdns-sysattrs: true
    mdns-name: devicename

Closes #1511

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-12 23:27:50 +01:00
Wouter BornandGitHub ccc21ac87d Exclude logback-classic from org.apache.aries.jax.rs.whiteboard (#2552)
There should only be one SLF4J binding used for logging and we already use slf4j-simple.

This fixes the following warning when running unit tests:

SLF4J: Class path contains multiple SLF4J bindings.
SLF4J: Found binding in [jar:file:/home/wouter/.m2/repository/org/slf4j/slf4j-simple/1.7.32/slf4j-simple-1.7.32.jar!/org/slf4j/impl/StaticLoggerBinder.class]
SLF4J: Found binding in [jar:file:/home/wouter/.m2/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/org/slf4j/impl/StaticLoggerBinder.class]
SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
SLF4J: Actual binding is of type [org.slf4j.impl.SimpleLoggerFactory]

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-01 17:27:20 +01:00
Wouter BornandGitHub a2ef0084d2 Upgrade JAX-RS Whiteboard and CXF (#2532)
* Upgrade JAX-RS Whiteboard and CXF

* Upgrades Aries JAX-RS Whiteboard from 2.0.0 to 2.0.1
* Upgrades CXF from 3.4.3 to 3.4.5

For CXF release notes, see:

* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12350023
* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12350279

Fixes #2512

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-25 11:55:02 +02:00
Wouter BornandGitHub 569dddd046 Exclude JUnit 4 from Whiteboard and update imports to JUnit 5 (#2534)
* Exclude JUnit 4 from Whiteboard and update imports to JUnit 5

Excludes the transitive JUnit 4 dependency from the Aries JAX-RS Whiteboard.
The Whiteboard should not have a compile scope dependency on JUnit so I've created https://github.com/apache/aries-jax-rs-whiteboard/pull/135 to fix this.
The wrong scope has resulted in some tests using JUnit 4 imports which is also fixed in this PR.

Signed-off-by: Wouter Born <github@maindrain.net>

* Add commonly used JUnit 4 classes to forbidden packages

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-24 10:35:28 +02:00
J-N-KandGitHub 4569eea519 Extend marketplace to accept kar and some improvements (#2490)
Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2021-09-23 17:07:34 +02:00
Wouter BornandGitHub 0d5b2d6140 Upgrade to Karaf 4.3.3 (#2489)
* Syncs dependencies with Karaf 4.3.3
* Resolves itest runbundles for these new dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-09-18 16:06:57 +02:00
Yannick SchausandGitHub 2663a3fc7e Community Marketplace Add-on Service - initial contribution (#2405)
Signed-off-by: Yannick Schaus <github@schaus.net>
2021-09-14 09:04:04 +02:00
Wouter BornandGitHub 4d842f4ba3 Upgrade XStream to 1.4.18 (#2482)
For release notes, see:

https://x-stream.github.io/changes.html#1.4.18

Signed-off-by: Wouter Born <github@maindrain.net>
2021-09-11 15:21:31 +02:00
Kai Kreuzer 5a667cc868 applied spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-06-27 23:22:02 +02:00
jenkins b8d2077805 [unleash-maven-plugin] Preparation for next development cycle. 2021-06-27 15:50:02 +00:00
Kai KreuzerandGitHub f8c2def130 upgrade to JUPnP 2.6.0 (#2396)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-06-02 09:21:15 +02:00
Kai KreuzerandGitHub 17f95768a4 Update to new JmDNS release 3.5.7 (#2391)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-05-30 18:42:50 +02:00
Wouter BornandGitHub 85f17aefa4 Upgrade XStream to 1.4.17 (#2369)
Upgrades XStream from 1.4.15 to 1.4.17

Prevents the following vulnerabilities when using XStream instances with an uninitialized security framework:

* CVE-2021-21341
* CVE-2021-21342
* CVE-2021-21343
* CVE-2021-21344
* CVE-2021-21345
* CVE-2021-21346
* CVE-2021-21347
* CVE-2021-21348
* CVE-2021-21349
* CVE-2021-21350
* CVE-2021-21351
* CVE-2021-29505

See: http://x-stream.github.io/changes.html#1.4.17

Related to: #2250, #2251

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-19 21:15:55 +02:00
Wouter BornandGitHub e3f12c8a45 Upgrade to Karaf 4.3.2 (#2363)
* Syncs dependencies with Karaf 4.3.2
* Resolves itest runbundles for these new dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-17 21:09:46 +02:00
Wouter BornandGitHub d25bb2814d Update Jackson to 2.12.3 (#2357)
Updates Jackson from 2.12.2 to 2.12.3.

For release notes, see:

https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12.3

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-12 07:38:47 +02:00
Wouter BornandGitHub 0a735fa3a7 Update Swagger to 2.1.9 (#2356)
Updates Swagger from 2.1.7 to 2.1.9.

For release notes, see:

* https://github.com/swagger-api/swagger-core/releases/tag/v2.1.8
* https://github.com/swagger-api/swagger-core/releases/tag/v2.1.9

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-12 07:38:16 +02:00
Wouter BornandGitHub 83918b7424 Update jose4j to 0.7.7 (#2355)
Updates jose4j from 0.7.0 to 0.7.7.

For release notes, see:

https://bitbucket.org/b_c/jose4j/wiki/Release%20Notes

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-11 20:52:12 +02:00
Wouter BornandGitHub 91307993ad Upgrade Units of Measurement dependencies (#2319)
Upgrades UoM dependencies to:

* javax.measure 2.1.2
* si-units 2.0.1
* indriya 2.1.2

An openHAB OSGi-ified si-units bundle is used as runtime dependency, because the latest si-units release is still missing proper OSGi manifest headers.

Notable changes:

* Quantity not longer implements an `equals` method, so the unit tests had to be adjusted. This should have any impact outside of the unit tests though since the rest of openHAB should be using QuantityType instead.
* RationalConverter is not package private, so instances of it much be created through the MultiplyConverter static functions.
* Quantities.getQuantity can no longer parse values without units like `100`. A workaround has been implemented.
* The unicode greek `mu` letter is now returned for unit prefixes instead of the unicode `micro` character. These characters are visually identical but the unit tests had to be adjusted. The new library seems to parse both types just fine.

Also-by: Connor Petty <mistercpp2000+gitsignoff@gmail.com>
Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-10 20:54:25 +02:00
Wouter BornandGitHub 99a5f571c7 Update runtime BOM for hivemq-mqtt-client upgrade (#2345)
Related to #2327
Fixes #2344

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-05 20:50:10 +02:00
Wouter BornandGitHub d5e1ebca68 Remove commons-io and commons-codec dependencies (#2329)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-02 11:06:01 +02:00
Wouter BornandGitHub b778732e74 Upgrade hivemq-mqtt-client to 1.2.2, Netty to 4.1.63.Final (#2327)
Upgrades:

* hivemq-mqtt-client from 1.1.2 to 1.2.2
* Netty from 4.1.42.Final to 4.1.63.Final

For all fixes and improvements of these upgrades, see:

* https://github.com/hivemq/hivemq-mqtt-client/releases/
* https://netty.io/news/index.html

Fixes #2309

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-28 08:53:20 +02:00
Wouter BornandGitHub 0fe6b31f19 Upgrade Aries JAX-RS Whiteboard to 2.0.0 (#2316)
Upgrades the Aries JAX-RS Whiteboard from 1.0.9 to 2.0.0

The biggest change is that CXF is now an external dependency of the Aries JAX-RS Whiteboard bundle.
This also fixes the issue that you could not properly debug the CXF code because there was no source code for the embedded classes.
CXF 3.4.3 is now used instead of 3.2.14.

For release notes see:

* Changelog: https://github.com/apache/aries-jax-rs-whiteboard/blob/master/changelog.md
* Apache JIRA: https://issues.apache.org/jira/issues/?jql=project%20%3D%20ARIES%20AND%20fixVersion%20in%20(jax-rs-whiteboard-1.0.10%2C%20jax-rs-whiteboard-1.1.0%2C%20jax-rs-whiteboard-2.0.0)%20AND%20component%20%3D%20jax-rs-whiteboard

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-25 11:23:56 +02:00
Kai KreuzerandGitHub 79edf2b9e6 Upgrade org.apache.servicemix.specs.activation-api-1.2.1 to fix mail sending (#2292)
Fixes #2273

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-04-14 23:32:56 +02:00
Wouter BornandGitHub 6eba0a0c33 Upgrade Xtext/Xtend to 2.25.0, LSP4J to 0.10.0 (#2278)
For release notes, see:

https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2021/03/02/version-2-25-0
https://github.com/eclipse/lsp4j/blob/master/CHANGELOG.md#v0100-nov-2020

Also aligns the spifly and xbean runtime dependencies with Karaf 4.3.1 which was not possible because the older Xtext required ASM 8.0.1.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-08 16:17:59 +02:00
Wouter BornandGitHub ef1b86c1d1 Upgrade to OSGi R7 and Karaf 4.3.1 (#2264)
* Aligns compile dependencies with OSGi R7
* Aligns runtime dependencies with Karaf 4.3.1
* Fixes issues due to dependency changes:
  * AudioServletTest never ending due to Jetty upgrade
  * Feature resolution failing due to Karaf activation-api no longer visible
* Uses Pax Logging as runtime dependency instead of Felix Log
  This dependency change makes itests and Demo App behave more like the actual distro
  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 13:39:54 +02:00
Kai KreuzerandGitHub ee1d3f3a73 Removed outdated basic auth classes (#2245)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-03-20 12:46:30 +01:00
Wouter BornandGitHub 4bf156ffc0 Upgrade Gson to 2.8.6 (#2244)
* Upgrade Gson to 2.8.6

Upgrades Gson from 2.8.2 to 2.8.6.

See change log: https://github.com/google/gson/blob/master/CHANGELOG.md#version-286

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-17 19:18:17 +01:00
Wouter BornandGitHub f8f86bfdc3 Remove commons-lang dependency (#2235)
There was already a transitive commons-lang3:3.9 compile dependency used by several add-ons.
This is a transitive dependency of pax-web-jetty and swagger-core.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-16 15:11:59 +01:00
Wouter BornandGitHub 80961d0670 Exclude jetbrains annotations (#2242)
This helps with preventing contributors from annotating classes with wrong annotations.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-15 08:20:54 +01:00
Kai KreuzerandGitHub f72e3b239d Update outdated group id for antlr (#2240)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-03-13 18:42:51 +01:00
Wouter BornandGitHub 4a79e9bfe7 Upgrade Swagger to 2.1.7 (#2227)
Upgrades Swagger from 2.1.0 to 2.1.7 .

See the tags on GitHub for release notes, e.g.:

https://github.com/swagger-api/swagger-core/releases/tag/v2.1.7

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-07 10:02:27 +01:00
Wouter BornandGitHub 4e27285e5f Upgrade Jackson to 2.12.2 (#2226)
Upgrades Jackson from 2.10.3 to 2.12.2.

For release notes see:

* https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.10
* https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.11
* https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12

Also adds jackson-dataformat-cbor to the feature and runtime BOM so it can be more easily managed as it is a small bundle that is used by a few add-ons.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-06 16:48:33 +01:00
pravussumandGitHub f061512dd5 Integrated micrometer metering #774 (#2133)
Signed-off-by: Robert Bach <openhab@mortalsilence.net>
2021-02-11 21:12:58 +01:00
Wouter BornandGitHub d50ea56da8 Stop commons-net proliferation (#2151)
* Exclude commons-net from core dependencies so it is no longer automatically a transitive compile dependency
* Update nrjavaserial compile dependency to a version that no longer includes commons-net packages
* Define and use commons.net.version property
* Rework features so commons-net is only installed when required

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-24 21:43:08 +01:00
Stefan TrillerandGitHub ec76baa881 Bump apache-commons.net to 3.7.2 (#2141)
Signed-off-by: Stefan Triller <github@stefantriller.de>
2021-01-23 21:53:55 +01:00
Wouter BornandGitHub 074bd7a623 Fix BOM dependency issues (#2120)
* Sync biz.aQute.tester.junit-platform version using bnd.version property
* Remove duplicate osgi-resource-locator dependency, causing warnings/unstability

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-15 16:33:39 +01:00
Wouter BornandGitHub 64f444cf6e Update Mockito, JUnit and use MockitoExtensions in itests (#2075)
* 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-05 22:58:58 +01:00
Wouter BornandGitHub badabc13e5 Upgrade to XStream 1.4.15 (#1997)
For changes, see: https://x-stream.github.io/changes.html

Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-23 20:11:44 +01:00
Wouter BornandGitHub bf14e1077f Apply Spotless, resolve itest runbundles for 3.1.0 (#1982)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-22 10:01:42 +01:00
jenkins 965531696b [unleash-maven-plugin] Preparation for next development cycle. 2020-12-20 22:24:39 +00:00
Kai KreuzerandGitHub e075df30f8 Moved modbus transport from addons to core (#1892)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-12-08 12:55:52 +01:00
Kai KreuzerandGitHub a301e96b6c sync Jetty versions between compile and runtime (#1845)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-11-29 10:54:24 +01:00
Kai KreuzerandGitHub 8a3d438c4f upgraded JmDNS to version 3.5.6 (#1721)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-10-16 12:52:25 +02:00
Wouter BornandGitHub 159aefffa5 Remove unused DBus Transport (#1708)
Related to #960

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-10 08:08:22 +02:00