Commit Graph
66 Commits
Author SHA1 Message Date
Holger FriedrichandGitHub 8de8b4d4b4 Upgrade JUnit to 5.12.1 (#4642)
* Upgrade JUnit from 5.11.4 to 5.12.1
https://junit.org/junit5/docs/5.12.1/release-notes/#release-notes-5.12.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-03-16 22:40:06 +01:00
Holger FriedrichandGitHub 0d84485623 Dependency upgrades: californium, cxf, junit, swagger (#4584)
* Upgrade swagger to 2.2.28

* Upgrade swagger from 2.2.15 to 2.2.28
For changelog, see https://github.com/swagger-api/swagger-core/releases
* Upgrade javassist from 3.29.2-GA to 3.30.2-GA

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Upgrade cxf to 3.6.5

* Upgrade cxf from 3.6.4 to 3.6.5

Find the list of relevant changes here:
https://github.com/apache/cxf/blame/3.6.x-fixes/distribution/src/main/release/release_notes.txt

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Upgrade junit to 5.11.4

* Upgrade junit from 5.10.0 to 5.11.4
* Upgrade junit-platform-* from 1.10.0 to 1.11.4

Release notes: https://junit.org/junit5/docs/5.11.4/release-notes/

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Upgrade californium to 4.0.0-M2

* Upgrade californium from 2.7.4 to 4.0.0-M2
* Replace special OH built net.i2p.crypto.eddsa by BouncyCastle
* Upgrade slf4j from 2.0.12 to 2.0.16

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Upgrade hamcrest to 3.0

* Upgrade hamcrest from 2.2 to 3.0

Release notes: https://github.com/hamcrest/JavaHamcrest/releases/tag/v3.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

---------

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-02-13 15:23:21 +01:00
Holger FriedrichandWouter Born 6764b6d94c Upgrade Xtext/Xtend to 2.37.0
* Upgrade Xtext/Xtend from 2.36.0 to 2.37.0, see release notes:
  https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/11/19/version-2-37-0
  https://eclipse.dev/Xtext/xtend/releasenotes.html#/releasenotes/2024/11/19/version-2-37-0
* Upgrade dependencies
  * ecj from 3.36.0 to 3.39.0
  * gson from 2.10.1 to 2.11.0
  * classgraph to 4.8.176
  * guava from 3.33.0 to 3.33.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-26 15:15:29 +01:00
Holger FriedrichandWouter Born 4da70a2ed8 Upgrade Karaf from 4.4.6 to 4.4.7
* Sync runtime dependencies with Karaf 4.4.7, most notably:
   * PaxWeb 8.0.30
   * Jetty 9.4.57.v20241219
   * BouncyCastle 1.78.1
   * CXF 3.6.4
   * Jackson 2.18.2
   * JNA 5.16.0
   * JAXB 2.3.9
   * commons-io 2.17.0
   * commons-lang3 3.17.0
   * XBean 4.26
   * ASM 9.7.1
   * PaxLogging 2.2.8
 * Resolve itest runbundles

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-26 15:15:29 +01:00
Wouter BornandGitHub 9f0b8d48fe Revert LinkedTransferQueue high CPU usage workaround (#4499)
Reverts the workaround #3756 that was introduced for JDK-8301341 because it is fixed in OpenJDK 21

Signed-off-by: Wouter Born <github@maindrain.net>
2024-12-17 00:46:30 +01:00
Holger FriedrichandGitHub 8d837f9823 Prepare for OH 5.0.0 (#4496)
* Prepare for OH 5.0.0

* Switch to 5.0.0-SNAPSHOT
* Fix spotless after unleash
* resolve itest runbundles
* Fix linux-specific pom

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-12-15 18:49:23 +01:00
Wouter BornandGitHub fa29f52a99 Update bnd to 7.1.0 (#4464)
For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
2024-11-30 21:31:35 +01:00
Kai KreuzerandGitHub 21e605d212 Apply spotless after release, resolve bundles (#4301)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2024-07-07 23:22:27 +02:00
Holger FriedrichandGitHub 873bb53cbc Upgrade Karaf from 4.4.5 to 4.4.6 (#4181)
* Upgrade Karaf from 4.4.5 to 4.4.6

* Sync runtime dependencies with Karaf 4.4.6, most notably:
  * Jetty 9.4.54.v20240208, addresses CVE-2024-22201
  * Pax Logging 2.2.7
  * Pax Web 8.0.27
  * ASM 9.7
  * BouncyCastle 1.77
* Upgrade xtext to 2.35.0.M1
* Resolve itest runbundles

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-20 17:42:04 +02:00
Holger FriedrichandGitHub 3850599163 Upgrade to Karaf 4.4.5 and Xtext 2.34 (#4133)
* Upgrade to Karaf 4.4.5 and Xtext 2.34

Upgrade Karaf from 4.4.4 to 4.4.5:
* Sync runtime dependencies with Karaf 4.4.5, most notably:
  * Jetty 9.4.53.v20231009
  * JNA 5.14.0
  * Pax Logging 2.2.6
  * Pax Web 8.0.24
  * ASM 9.6
* Resolve itest runbundles

Upgrade Xtext from 2.32 to 2.34
* Sync depencencies, most notably:
  * Guava 33.0.0
  * classgraph 4.8.165 changing provider to io.github.classgraph
* Migrate old Xtext generator xtext.generator to xtext.xtext.generator
  as xtext.generator has been removed from Xtext, affecting
  org.openhab.core.model.lazygen

* resolve runbundles
* Remove org.openhab.core.model.lazygen
  No longer in use since 2017, see eclipse-archived/smarthome#4122.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-03-17 09:41:15 +01:00
Wouter BornandGitHub 6495f4e256 Upgrade Jollyday to 0.23.2 (#4033)
Upgrades Jollyday 0.5.10 (de.jollyday) to 0.23.2 of a more actively maintained fork (de.focus-shift).

* This adds many missing holidays.
* Also removes the workaround for the Danish Great Prayer Day introduced by #3573.

For release notes, see:

https://github.com/focus-shift/jollyday/releases

Fixes #3544

Signed-off-by: Wouter Born <github@maindrain.net>
2024-01-14 15:19:15 +01:00
Holger FriedrichandGitHub 839ba1ab4c Apply spotless after release, resolve bundles (#3953)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-22 23:14:28 +01:00
Wouter BornandGitHub 81f14c9df1 Upgrade logback-classic to 1.3.14 (#3935) 2023-12-19 23:26:22 +01:00
Wouter BornandGitHub eff85c6470 Upgrade JUnit to 5.10.0 (#3832)
Upgrades JUnit from 5.9.2 to 5.10.0.

For release notes, see:

https://junit.org/junit5/docs/5.10.0/release-notes/#release-notes-5.10.0

Signed-off-by: Wouter Born <github@maindrain.net>
2023-10-07 20:34:47 +02:00
Wouter BornandGitHub fb3d4e805d Update bnd to 7.0.0 (#3828)
For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
2023-10-06 18:45:20 +02:00
Wouter BornandGitHub fffa968263 Upgrade Xtext/Xtend to 2.32.0, LSP4J to 0.21.0 (#3817)
Upgrades Xtext and its dependencies to:

* Xtext/Xtend 2.32.0
* LSP4J 0.21.0
* GSON 2.10.1
* Guava 32.1.2
* Guice 7.0.0

For release notes, see:

https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2023/08/27/version-2-32-0

Fixes #3321

Signed-off-by: Wouter Born <github@maindrain.net>
2023-10-01 22:04:27 +02:00
Wouter BornandGitHub d4a433a4ce Upgrade to Karaf 4.4.4 (#3814)
* Sync runtime dependencies with Karaf 4.4.4, most notably:
  * Jetty 9.4.52.v20230823
  * JNA 5.13.0
  * SLF4J 2.0.6
  * Pax Logging 2.2.3
  * Pax Web 8.0.22
* Resolve itest runbundles
* Use new Pax Web features to simplify dependency management
* Add specs features because Pax Web now depends on "asm"

Signed-off-by: Wouter Born <github@maindrain.net>
2023-09-29 20:23:31 +02:00
Wouter BornandGitHub e1d2b88398 Update directory-watcher to 0.18.0 (#3790)
Updates the directory-watcher from 0.17.1 to 0.18.0.

This version has some bug fixes/improvements, see:

https://github.com/gmethvin/directory-watcher/compare/v0.17.1...v0.18.0

Signed-off-by: Wouter Born <github@maindrain.net>
2023-08-30 22:51:25 +02:00
Wouter BornandGitHub 7743e9f9ab Update CXF to 3.6.1 (#3770)
Updates CXF from 3.4.5 to 3.6.1

For some recent release notes, see:

* [3.5.0](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12348382)
* [3.6.0](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12351469)
* [3.6.1](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12353191)

This upgrade addresses:

* CVE-2022-46363
* CVE-2022-46364

Signed-off-by: Wouter Born <github@maindrain.net>
2023-08-21 21:23:09 +02:00
J-N-KandGitHub 04eb32185c Bump UoM libraries to 2.2 (#3758)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-08-18 21:38:43 +02:00
Wouter BornandGitHub aef57edd73 Use workaround to fix high CPU usage by LinkedTransferQueue (#3756)
This is a workaround for JDK-8301341 by using the Java 11 LinkedTransferQueue with the QueueingThreadPoolExecutor in the Core and jUPnP.

Signed-off-by: Wouter Born <github@maindrain.net>
2023-08-14 10:37:20 +02:00
Wouter BornandGitHub 3b91692be1 Fix build (#3726)
Signed-off-by: Wouter Born <github@maindrain.net>
2023-07-24 09:02:01 +02:00
Wouter BornandGitHub 0894d25448 Upgrade JUnit to 5.9.2 and Mockito to 4.11.0 (#3450)
For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-12 20:47:54 +01:00
Wouter BornandGitHub 0c792ec89a Upgrade XStream to 1.4.20 (#3446)
This addresses CVE-2022-40151 and CVE-2022-41966, see:

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

This version also fixes an issue with closing streams so the workaround in GenerateDefaultTranslationsMojoTest is no longer needed.

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-12 12:22:33 +01:00
Wouter BornandGitHub ec3af50f11 Upgrade to Karaf 4.4.3 (#3252)
* Sync runtime dependencies with Karaf 4.4.3, most notably:
  * Jetty 9.4.50.v20221201
  * Pax Logging 2.2.0
  * Pax Web 8.0.15
* Use OSGi R8 as compile dependency
* Rework Servlets to use Http Whiteboard annotations in favor of proprietary `org.openhab.core.io.http.servlet` classes
* Resolve itest runbundles

Also-by: Jan N. Klug <github@klug.nrw>

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-01 13:09:07 +01:00
J-N-KandGitHub 7f113c51bc Refactor WatchService (#3004)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-12 14:12:22 +01:00
J-N-KandGitHub 3d54ee54d2 Introduce metadata for all add-ons (#3050)
* Introduce addon.xml

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-15 15:31:42 +01:00
J-N-KandGitHub 41ba3ff854 Raise minimum JDK version to 17 (#2994)
* Raise source level to Java 17 (except for model classes)
* Remove Nashorn script engine
* Upgrade spotless and add jvm options  
  See https://github.com/diffplug/spotless/issues/834
* Add suppression for findBugs false positive error
* Upgrade xtext to 2.29.0
* Adjust JNA
* Resolve itests

Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 19:52:43 +01:00
J-N-KandGitHub 3fc4d23734 Fix spotless and resolve itests (#3239)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 11:09:31 +01:00
J-N-KandGitHub 9c3e2f3f06 Upgrade bnd to 6.4.0 (#3205)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-09 20:07:51 +01:00
J-N-KandGitHub e90811cfd7 DSL support for sharedCache/privateCache (#3187)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-05 22:08:42 +01:00
Kai KreuzerandGitHub 61fd47c853 Apply spotless and resolver (#3018)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2022-06-27 13:41:28 +02:00
J-N-KandGitHub 8f3ad5ce12 Bump bnd to 6.3.0 (#2991)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-06-02 08:36:54 +02:00
J-N-KandGitHub 7027e1e139 [test] Allow intercepting logs and make assertions for log messages (#2939)
* [test] Allow intercepting logs and make assertions for log messages

Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-05-25 21:13:40 +02:00
Wouter BornandGitHub 4ab0f83e83 Upgrade to Karaf 4.3.7 (#2934)
* Syncs dependencies with Karaf 4.3.7
* Resolves itest runbundles for these new dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2022-04-28 22:00:16 +02:00
J-N-KandGitHub e64c06c22b Upgrade build tools and allow building on macOS 12 / M1 (#2836)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-03-12 21:05:37 +01:00
Wouter BornandGitHub 44f9baff18 Upgrade Xtext/Xtend to 2.26.0, LSP4J to 0.12.0 (#2786)
For release notes, see:

https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2022/02/28/version-2-26-0

This release adds initial support for Java 17.

Signed-off-by: Wouter Born <github@maindrain.net>
2022-03-05 11:28:56 +01:00
Wouter BornandGitHub 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 WeitkampandGitHub 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 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 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 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 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 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
Christoph WeitkampandGitHub 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 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 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 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 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