Commit Graph

33 Commits

Author SHA1 Message Date
Wouter Born
ab929b50aa
Upgrade to Karaf 4.3.6 (#2689)
* Syncs dependencies with Karaf 4.3.6
* Resolves itest runbundles for these new dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2022-01-16 11:55:04 +01:00
Christoph Weitkamp
89fff918ad
Resolve itest runbundles for snapshot 3.3.0 (#2631)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2021-12-20 08:09:08 +01:00
Wouter Born
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 Born
ca063a3a2f
Update bnd to 6.1.0 (#2583)
For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-28 21:57:31 +01:00
Wouter Born
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 Born
3d722ec13b
Upgrade UoM dependencies (#2573)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-21 10:27:20 +01:00
Wouter Born
d2557f950c
Update bnd to 6.0.0 (#2514)
For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-09 18:43:56 +02:00
Wouter Born
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
Wouter Born
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
Christoph Weitkamp
b2336a53fd
Resolve itest runbundles for snapshot 3.2.0 (#2419)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2021-06-28 11:19:17 +02:00
Wouter Born
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 Born
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 Born
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 Born
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
Wouter Born
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 Born
b0b6848e04
Update bnd to 5.3.0 (#2217)
See: https://github.com/bndtools/bnd/wiki/Changes-in-5.3.0

Fixes https://github.com/openhab/openhab-core/issues/2134

Signed-off-by: Wouter Born <github@maindrain.net>
2021-02-28 21:33:08 +01:00
Wouter Born
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 Born
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 Born
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 Born
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
Wouter Born
d1629e50f3
Upgrade to XStream 1.4.13 (#1688)
* Fixes bugs (vulnerabilities/performance issues)
* Supports OSGi better
* Prevents illegal reflective access warnings on newer Java versions
* Supports java.time converters

For XStream release notes see: https://x-stream.github.io/changes.html

The XmlDocumentReader which uses XStream has also been modified to configure XStream security to prevent "Security framework of XStream not initialized, XStream is probably vulnerable" warnings.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-04 19:56:44 +02:00
Wouter Born
af266b5d9f
Upgrade to Jollyday 0.5.10 (#1684)
With some excludes and the upgraded JAXB I got the most recent Jollyday version working.
The integration tests also succeed again on Java 11.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-03 11:04:25 +02:00
Wouter Born
3bf2f4934d
Upgrade Maven compiler and fix/upgrade some TP dependencies (#1683)
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-02 23:36:37 +02:00
Wouter Born
d3ea6063c0
Migrate to JUnit 5 (#1580)
* Migrates all tests to the JUnit 5 Jupiter API
* Updates bnd to 5.1.2
* Updates maven-surefire-plugin to 3.0.0-M5
* Updates Mockito to 3.4.6
* Updates Hamcrest to 2.2
* Removes org.openhab.core.boot POM dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2020-08-09 14:36:46 +02:00
Christoph Weitkamp
8808f04c30
Removed dependency on 'org.apache.commons.io' (#1441)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2020-05-21 15:17:00 +02:00
Wouter Born
859da2e1c7
Migrate to JAX-RS Whiteboard (#1443)
* Migrate to JAX-RS Whiteboard
* Upgrade Jackson and Swagger TP feature dependencies

The upstream JAX-RS Whiteboard feature is not used because the version ranges currently do not work with Karaf on Windows.
See: https://issues.apache.org/jira/browse/KARAF-6536

* Update Felix logback to 1.0.2

This version adds the jul-to-slf4j bridge (FELIX-6027).
JUL is used by CXF and using the bridge we can use logback to reduce the verbosity of the info logging whenever org.apache.cxf.endpoint.ServerImpl creates endpoints.

* Update Aries Whiteboard to 1.0.8
* Removes the hated default web application (ARIES-1931)
* Improves performance
* Uses CXF 3.2.12
* Don't reuse SSE event builders

SSE event builders are not thread-safe.
It also causes the wrong default values being used.

Also-by: Markus Rathgeb <maggu2810@gmail.com>
Signed-off-by: Wouter Born <github@maindrain.net>
2020-05-14 22:32:35 +02:00
Christoph Weitkamp
d371a34321
Removed dependency on 'org.apache.commons.lang' (#1433)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2020-04-22 14:32:31 +02:00
Christoph Weitkamp
170e48618b Run resolver on integration tests to fix the build (#1277)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-12-16 00:22:35 +01:00
Markus Rathgeb
7ba7ee2a86 update runtime dependencies to sync Jetty and Pax Web versions (#1218)
Use the same Pax Web and Jetty version for the runtime dependencies
(used by the demo application) as is used in the Karaf distribution.

This PR needs to be merged synchron to the updated bndrun in the openHAB
demo repository.

Related to: https://github.com/openhab/openhab-core/pull/1197#issuecomment-553029014

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-11-17 11:47:24 +01:00
Christoph Weitkamp
7634f3de5f [itest] Exclude json and mapdb storage by default for itests (#1193)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-11-08 20:04:48 +01:00
Wouter Born
d627a6b7e6 Downgrade Jollyday again to fix Java 11 build issues (#1195)
Jollyday requires JAXB 2.3 on Java 11 whereas only 2.2 is available during compilation for Java 8 compatibility.

See also:
* https://github.com/openhab/openhab2-addons/issues/6334
* https://github.com/openhab/openhab-core/pull/1170
* https://github.com/openhab/openhab-core/pull/1169

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-08 15:18:58 +01:00
Christoph Weitkamp
92a0017e49 Bump jollyday version to 0.5.9 (#1170)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-29 20:39:11 +01:00
Christoph Weitkamp
2bb5cb7f64 [ephemeris] Adopted configuration for Ephemeris service (#919)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-04 21:33:43 -07:00