Commit Graph
252 Commits
Author SHA1 Message Date
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 8d64ecfd8d Update license header to 2023 (#3294)
* Update license header to 2023

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-03 09:45:42 +01:00
Wouter BornandGitHub 0a755e8f08 Use HTTPS with website URL in pom.xml (#3256)
Signed-off-by: Wouter Born <github@maindrain.net>
2022-12-22 21:43:38 +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
openhab-bot 35254b3a0a [unleash-maven-plugin] Preparation for next development cycle. 2022-12-18 23:08:22 +00: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
Wouter BornandGitHub 03b13bd31e Move Eclipse m2e configuration to a profile (#3034)
This prevents the following warnings when executing: `mvn i18n:generate-default-translations`

[WARNING] The POM for org.eclipse.m2e:lifecycle-mapping:jar:1.0.0 is missing, no dependency information available
[WARNING] Failed to retrieve plugin descriptor for org.eclipse.m2e:lifecycle-mapping:1.0.0: Plugin org.eclipse.m2e:lifecycle-mapping:1.0.0 or one of its dependencies could not be resolved: org.eclipse.m2e:lifecycle-mapping:jar:1.0.0 was not found in https://openhab.jfrog.io/openhab/libs-snapshot during a previous attempt. This failure was cached in the local repository and resolution is not reattempted until the update interval of openhab-snapshot has elapsed or updates are forced

Signed-off-by: Wouter Born <github@maindrain.net>
2022-07-09 17:38:12 +02:00
Wouter BornandGitHub ca1711a2ea Upgrade i18n-maven-plugin to 3.3.0 (#3019)
Signed-off-by: Wouter Born <github@maindrain.net>
2022-06-28 21:11:05 +02: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
openhab-bot 8944bdbbe4 [unleash-maven-plugin] Preparation for next development cycle. 2022-06-26 16:37:00 +00: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
Wouter BornandGitHub 226427d24e Upgrade SAT to 0.13.0 (#2978)
See the [0.13.0](https://github.com/openhab/static-code-analysis/milestone/20?closed=1) milestone for all changes in this release.

Signed-off-by: Wouter Born <github@maindrain.net>
2022-05-24 14:04:37 +02:00
Jacob LaursenandGitHub eec6de523d Upgrade directory-maven-plugin from 0.3.1 to 1.0 (#2973)
Fixes build on Windows

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
2022-05-20 20:52:00 +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 a54ef35adc Add Java 17 to GHA CI build matrix (#2817)
This adds Java 17 to the GitHub Actions CI build matrix so we can make sure the build keeps working with both Java 11 and Java 17.
It also updates the required Java version range used by the enforcer plugin so it is also possible to build with the supported Java versions.
Furthermore it prevents duplicate error annotations being added by only adding these in the Java 11 matrix build.

Signed-off-by: Wouter Born <github@maindrain.net>
2022-03-05 17:24:10 +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 5e33cfc26a Fix test failures when building with Java 17 (#2788)
* Adds some --add-opens to maven-surefire-plugin for:
  * modbus transport tests (java.net)
  * tests using Gson/XStream (java.util)
* Only run ScriptScopeOSGiTest when Nashorn is available as it has been removed since JDK 15

Signed-off-by: Wouter Born <github@maindrain.net>
2022-02-20 20:40:10 +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
Wouter BornandGitHub 0a778df0ad Update groovy license headers to 2022 (#2675)
* Update groovy license headers to 2022
* Reuse existing header file and use Groovy 3.0.9

Updates the year in a few groovy file headers that were missed in #2671.

Signed-off-by: Wouter Born <github@maindrain.net>
2022-01-08 17:03:39 +01:00
Christoph WeitkampandGitHub cabb3f7315 Update license headers to 2022 (#2671)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2022-01-07 13:16:42 +01:00
Kai KreuzerandGitHub e3b07782b4 pom reference update from http to https (#2644)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-12-23 22:55:20 +01:00
Wouter BornandGitHub 3bcbaca6c0 Add i18n-maven-plugin dependency (#2632)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-22 20:25:46 +01:00
Kai Kreuzer 1ebf7395d9 Apply spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-12-20 06:59:22 +01:00
openhab-bot 5ac05c4968 [unleash-maven-plugin] Preparation for next development cycle. 2021-12-19 21:49:34 +00: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 a9504bfced Revert "Add i18n-maven-plugin dependency (#2584)" (#2585)
This reverts commit e0544e2cba.
2021-12-03 09:44:05 +01:00
Wouter BornandGitHub e0544e2cba Add i18n-maven-plugin dependency (#2584)
When the plugin dependency is managed you can also use the plugin without adding GAV parameters to commands.

E.g. it allows for using it with:

```
mvn i18n:generate-default-translations
```

Related to #2544

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-02 08:04:43 +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 f1319c283a Suppress bnd warnings for unused imports/exports (#2560)
Ignores warnings like:

```
Warning:  /home/runner/work/openhab-addons/openhab-addons/bom/runtime-index/pom.xml [0:0]: Unused Export-Package instructions: [org.openhab.*]
Warning:  /home/runner/work/openhab-addons/openhab-addons/bom/runtime-index/pom.xml [0:0]: Unused Import-Package instructions: [io.swagger.v3.oas.annotations.*,
```

These are safe to ignore because the import/export packages are globally defined and not every bundle imports/exports all these packages.

The `skipIfEmpty` configuration furthermore prevents warnings when the bnd-maven-plugin runs on projects that don't have any code like BOMs.

More important compiler/SAT warnings standout more when there are there are fewer useless warnings.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-05 13:56:25 +01:00
Wouter BornandGitHub 287a2eb0c9 Upgrade SAT to 0.12.0 (#2554)
See the [0.12.0 milestone](https://github.com/openhab/static-code-analysis/milestone/18?closed=1) for all changes in this release.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-02 08:17:50 +01:00
Wouter BornandGitHub 1db273efb6 Configure default timeout of 15 minutes for all testable and lifecycle methods (#2550)
This helps to identify what tests cause builds to fail and it will more quickly end builds.

For instance the WebClientFactoryImplTest currently often hangs on my local builds.
With this configuration in place it is easy to see and it will timeout after 15 minutes:

[ERROR] Tests run: 5, Failures: 0, Errors: 1, Skipped: 4, Time elapsed: 900.207 s <<< FAILURE! - in org.openhab.core.io.net.http.internal.WebClientFactoryImplTest
[ERROR] org.openhab.core.io.net.http.internal.WebClientFactoryImplTest.testGetClients  Time elapsed: 900.194 s  <<< ERROR!
java.util.concurrent.TimeoutException: tearDown() timed out after 15 minutes

See: https://junit.org/junit5/docs/current/user-guide/#writing-tests-declarative-timeouts

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-31 10:08:47 +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
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
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 ebd82d638e Fix JavaDoc build by upgrading plexus-java dependency (#2359)
This fixes the issue that the tech.units.indriya packages cannot be resolved in the JavaDoc build.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-12 22:07:25 +02:00
Kai KreuzerandGitHub 6cfa359d33 Adapted url for Artifactory (#2303)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-04-20 18:57:29 +02:00
Christoph WeitkampandGitHub 00c822816c Use SAT release version 0.11.1 (#2290)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2021-04-14 15:15:03 +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
Wouter BornandGitHub cda72d5f14 Upgrade lastnpe EEA to 2.3.0 (#2259)
For release notes, see:

https://github.com/lastnpe/eclipse-null-eea-augments/releases/tag/v2.3.0

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-26 22:39:32 +01:00
Wouter BornandGitHub 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 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
Wouter BornandGitHub 987af36bcf Update bnd to 5.2.0 (#2105)
See: https://github.com/bndtools/bnd/wiki/Changes-in-5.2.0

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-12 22:01:14 +01:00
Fabian WolterandGitHub 55d2aaf5e8 [skeleton] Remove license header from feature.xml (#2063)
Signed-off-by: Fabian Wolter <github@fabian-wolter.de>
2021-01-03 19:11:58 +01:00
Wouter BornandGitHub 774b9d607b Update license headers to 2021 (#2041)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-01 16:43:46 +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