Commit Graph
57 Commits
Author SHA1 Message Date
Holger FriedrichandGitHub 52e1185e41 Fix Xtend warnings (#4578)
* Fix Xtend warnings

* Remove unused imports and unnecessary private modifiers
* Use === when comparing to null
* Replace deprecated initializeLater

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-02-15 16:24:48 +01:00
Holger FriedrichandGitHub ab870d73df Reduce SAT warnings (#4567)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-02-15 16:23:24 +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 FriedrichandGitHub 7b85d6d175 Fix version of fasterxml.woodstox (#4581)
* Add wstx version matching cxf 3.x

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-28 23:46:43 +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
Holger FriedrichandWouter Born e94a3fefa3 Revert "Start spifly early (#4526)"
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-26 15:15:29 +01:00
Holger FriedrichandGitHub 7548f26db6 Remove RegistryHook (#4568)
Remove RegistryHook which is not longer used. Remove related methods
from ItemRegistry and ItemUiRegistry.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-26 14:55:08 +01:00
Holger FriedrichandGitHub 98552a4d88 Upgrade plugins (#4537)
* exec-maven-plugin to 3.5.0
https://github.com/mojohaus/exec-maven-plugin/releases
* maven-dependency-plugin to 3.8.1
* maven-plugin-plugin to 3.15.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-07 18:22:30 +01:00
Holger FriedrichandGitHub 7ae5d7aae8 Fix JavaDoc output directory (#4541)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-07 08:22:45 +01:00
Holger FriedrichandGitHub 40d079ae80 Java 21 language features (#4535)
* Java 21 language features

* use getFirst and getLast methods
* replace new Locale by Locale.of
* replace Paths.get by Path.of
* use ThreadLocalRandom.current().nextDouble()
* add @Serial annotations

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-06 23:22:43 +01:00
Holger FriedrichandGitHub 1e0b3c2410 Upgrade plugins (#4536)
* sortpom-maven-plugin to 4.0.0 (breaking change)
https://github.com/Ekryd/sortpom?tab=readme-ov-file#news
* maven-clean-plugin to 3.4.0
https://github.com/apache/maven-clean-plugin/releases/tag/maven-clean-plugin-3.4.0
* maven-deploy-plugin to 3.1.3
https://github.com/apache/maven-deploy-plugin/releases/tag/maven-deploy-plugin-3.1.3
* maven-enforcer-plugin to 3.5.0
https://github.com/apache/maven-enforcer/releases
* maven-install-plugin to 3.1.3
https://github.com/apache/maven-install-plugin/releases
* maven-plugin-plugin to 3.15.1
* license-maven-plugin to 4.6
https://github.com/mathieucarbou/license-maven-plugin/releases
* maven-jar-plugin to 3.4.2
https://github.com/apache/maven-jar-plugin/releases/tag/maven-jar-plugin-3.4.2
* maven-archetype-plugin to 3.3.1
* maven-dependency-plugin to 3.8.1
* maven-javadoc-plugin to 3.11.2
* maven-release-plugin to 3.1.1
* maven-shade-plugin to 3.6.0
* maven-site-plugin to 3.21.0
* maven-surefire-plugin to 3.5.2
* build-helper-maven-plugin
https://github.com/mojohaus/build-helper-maven-plugin/releases/tag/3.6.0
* i18n-maven-plugin to latest OH release 4.3.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-01-04 09:48:42 +01:00
Holger FriedrichandGitHub 1f9ba2b0ee Remove workaround for Xtend/Java21 (#4519)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-12-24 09:47:56 +01:00
Holger FriedrichandGitHub c2d8392668 Remove Java 17 build, switch to 21 (#4483)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-12-15 20:36:45 +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
Holger FriedrichandGitHub 660102e3f9 Upgrade XStream to 1.4.21 (#4457)
* Upgrade XStream from 1.4.20 to 1.4.21, fixes CVE-2024-47072.
  See changelog at https://x-stream.github.io/changes.html#1.4.21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-11-18 23:34:06 +01:00
Holger FriedrichandGitHub aededaecc2 [DSL] Expose ColorUtil methods to DSL rules (#4410)
* [DSL] Expose ColorUtil methods to DSL rules

* Expose xyToKelvin and kelvinToXY
* Add missing throws declaration

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-11-17 10:33:19 +01:00
Holger FriedrichandWouter Born fa73d3cb49 Fix JavaDoc
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-10-25 08:03:46 +02:00
Holger FriedrichandWouter Born 22eec8c593 Upgrade Xtext/Xtend to 2.36.0
* Upgrade Xtext/Xtend from 2.35.0 to 2.36.0, see release notes:
  https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/08/25/version-2-36-0
  https://eclipse.dev/Xtext/xtend/releasenotes.html#/releasenotes/2024/08/25/version-2-36-0
* Upgrade dependencies
  * Guava from 33.2.0 to 33.3.0
  * Classgraph from 4.8.172 to 4.8.174

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-10-05 10:46:40 +02:00
Holger FriedrichandWouter Born 49199a4d86 Disable XbaseGenerated annotation where necessary
Workaround for issue in xtext code generator in xtext 2.36, see
eclipse/xtext#3182.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-10-05 10:46:40 +02:00
Holger FriedrichandGitHub c25d67a65b [persistence] Allow negative filter boundaries (#4400)
Modify xtext file for textual configuration of persistence.
Fixes #4396.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-10-05 09:49:59 +02:00
Holger FriedrichandGitHub 0e1883bdae Fix CodeQL warnings (#4348)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-08-17 14:57:45 +02:00
Holger FriedrichandGitHub fc454883c2 Reduce SAT warnings (#4339)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-08-11 10:04:26 +02:00
Holger FriedrichandGitHub ea71af9ead Upgrade Xtext to 2.35.0 (#4264)
* Upgrade Xtext from 2.35.0.M1 to 2.35.0 final release, see release notes:
  https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2024/05/28/version-2-35-0
* Upgrade dependencies
  * Guava from 33.1.0 to 33.2.0
  * Lsp4j from 0.22.0 to 0.23.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-06-01 20:55:32 +02:00
Holger FriedrichandGitHub c98c637cf8 Upgrade Jollyday to 0.28.1 (#4244)
* Upgrade Jollyday from 0.27.0 to 0.28.1.
This release includes the fixed class loader working also in OSGI
setups.
* Upgrade jackson from 2.16.0 to 2.28.1
* Upgrade threeten-extra from 1.7.2 to 1.8.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-24 18:50:49 +02:00
Holger FriedrichandGitHub 43b57eb9e9 String translations for IP add-on finder (#4232)
Translate backslash sequences in requestPlain.
See String.translateEscapes().

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-23 19:10:45 +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 352dbf2aaa Update i18n property files (#4229)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-18 18:43:53 +02:00
Holger FriedrichandGitHub 593681a681 Harmonize library versions (#4228)
* Use jdt.annotation 2.2.100 (i18n tool)
* Use gson 2.10.1 (i18n tool, upgrade tool)
* Use logback 1.3.14 (test)

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-14 20:56:00 +02:00
Holger FriedrichandGitHub 767cbd93d3 Fix javadoc build (#4208)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-05-02 23:36:34 +02:00
Holger FriedrichandGitHub fa9cff6be9 GsonBuilder: Explicitly set date format (#4185)
Between Java 17 and Java 21, serialization of DateTime has changed due to
CLDR 42 which uses a narrow non-breaking space.
To ease switching JDK versions, the seralization format is explicitly
set to the Java 17 format.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-28 17:11:54 +02:00
Holger FriedrichandGitHub c316b07c47 Update plugins (#4197)
* set minimum Maven version to 3.6.3
* build-helper-maven-plugin, 3.4.0 to 3.5.0, see
  https://github.com/mojohaus/build-helper-maven-plugin/releases/tag/3.5.0
* jvnet maven-jaxb2-plugin, 0.15.2 to 0.15.3
* license-maven-plugin, 4.2 to 4.3
* maven-archetype-plugin, 3.0.1 to 3.2.1
* maven-assembly-plugin, 3.4.2 to 3.7.1, see https://github.com/apache/maven-assembly-plugin/releases
* maven-clean-plugin, 3.3.1 to 3.3.2, see https://github.com/apache/maven-clean-plugin/releases
* maven-dependency-plugin, 3.6.0/3.3.0/3.1.1 to 3.6.1, see
  https://github.com/apache/maven-dependency-plugin/releases/tag/maven-dependency-plugin-3.6.1
* maven-jar-plugin, 3.3.0 to 3.4.1, see https://github.com/apache/maven-jar-plugin/releases
* maven-javadoc-plugin, 3.6.2 to 3.6.3, see https://github.com/apache/maven-javadoc-plugin/releases
* maven-plugin-plugin, 3.11.0 to 3.12.0, see
  https://github.com/apache/maven-plugin-tools/releases/tag/maven-plugin-tools-3.12.0
* maven-shade-pluginm 3.5.2 to 3.5.3
* maven-source-plugin, 3.3.0 to 3.3.1
* maven-surefire-plugin, 3.1.2 to 3.2.5, see https://github.com/apache/maven-surefire/releases
* sortpom-maven-plugin, 3.3.0 to 3.4.1, see https://github.com/Ekryd/sortpom/releases
* spotless-maven-plugin, 2.38.0 to 2.43.0, see
  https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md
* openhab 18n-maven-plugin, 4.0.2 to 4.1.2

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-27 09:34:39 +02:00
Holger FriedrichandGitHub b563f1577a More instanceof pattern matching (#4191)
* More instanceof pattern matching

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-21 21:22:37 +02:00
Holger FriedrichandGitHub 10a20af50c [CI] Add Java 21 compiling to J17 and native J21 (#4186)
* [CI] Add Java 21 compiling to J17 and native J21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-21 11:47:40 +02:00
Holger FriedrichandGitHub a79a9c651b Reduce SAT warnings (#4187)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-20 19:17:47 +02:00
Holger FriedrichandGitHub 0db45fa168 Use flatMap to simplify map operations (#4190)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-20 19:15:06 +02:00
Holger FriedrichandGitHub 875ebaaef7 [rest] Fix Java 21 build (#4171)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-05 20:40:06 +02:00
Holger FriedrichandGitHub 3e16027b72 Bump maven-compiler-plugin to 3.13.0 (#4168)
Avoid ZipException with ejc >3.30.0.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-04 06:12:53 +02:00
Holger FriedrichandGitHub 9f5a60d6fa Allow for compiling with Java 21 (#4161)
* Support Java 17 and 21, default compilation to Java 17 class files,
  use maven.compiler.release instead of source and target
* Add profile "j21" to compile to Java 21 class files
* Upgrade SAT to 0.16.0, adapt code which breaks build with new SAT
  checks
* Use model-specific-profile to pin xtend to Java 17

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-04-01 13:46:57 +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
Holger FriedrichandGitHub 9c1c88519b Bump ecj to 3.36.0 (#4154)
Allow for compiling with Java 21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-03-17 09:25:21 +01:00
Holger FriedrichandGitHub bf11a92f40 Bump maven-plugin-plugin to 3.11.0 (#4153)
Allow for compiling with Java 21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-03-17 09:24:59 +01:00
Holger FriedrichandGitHub cf7bff88ee Bump maven-shade-plugin to 3.5.2 (#4152)
Allow for compiling with Java 21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-03-17 09:24:36 +01:00
Holger FriedrichandGitHub bca1010c0e Relax test to accept files with CRLF line endings (#4126)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-03-03 13:05:16 +01:00
Holger FriedrichandGitHub 40e6202c5f Minor extension to generic ip discovery (#3943)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-02-14 18:53:41 +01:00
Holger FriedrichandGitHub 7bac24e58f IpAddonFinder: Skip installed addons (#4013)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2024-01-04 22:27:18 +01:00
Holger FriedrichandGitHub 361273fcb5 IP addon finder: developer docs (#3948)
* IP addon finder: developer docs

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-27 20:25:32 +01:00
Holger FriedrichandGitHub 7213e7b06a Update Jackson to 2.16.0 (#3956)
Updates Jackson from 2.15.2 to 2.16.0

For release notes, see:

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

This upgrade addresses:

* CVE-2023-35116

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-23 21:54:36 +01:00
Holger FriedrichandGitHub e7fbd0179f Upgrade Netty to 4.1.104.Final (#3955)
Upgrades:

* Netty from 4.1.99.Final to 4.1.104.Final

For all fixes and improvements of these upgrades, see:

* https://netty.io/news/index.html

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-23 21:53:11 +01:00
Holger FriedrichandGitHub d1bbaba4d4 Javadoc: Introduce custom tags implNote and apiNote (#3945)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-23 14:52:51 +01:00
Holger FriedrichandGitHub bada23fdb8 Minor code cleanup (#3942)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-23 12:54:29 +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
Holger FriedrichandGitHub 5e94d8350b Additional logging AddonInfo addons.xml (#3928)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-20 11:19:35 +01:00
Holger FriedrichandGitHub 24b1784d44 Reduce SAT warnings (#3932)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-19 20:37:57 +01:00
Holger FriedrichandGitHub 8bed621c8c Service to suggest addons via generic IP scan (#3920)
* Service to suggest addons via generic IP scan

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-17 13:12:55 +01:00
fe5f130ca7 minor doc update to fix javadoc build (#3926)
* minor doc update to fix javadoc build

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
Co-authored-by: Andrew Fiddian-Green <software@whitebear.ch>
2023-12-16 17:22:40 +01:00
Holger FriedrichandGitHub 4e634c6b55 Service to suggest addons based on running processes (#3904)
* Service to suggest addons based on running processes

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-16 10:52:41 +01:00