Skip to content

Commit

Permalink
Fix build / Resolve itests (openhab#14018)
Browse files Browse the repository at this point in the history 
* Fix build / Resolve itests
* Remove Java 11 from GHA matrix

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jan N. Klug <github@klug.nrw>
Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
  • Loading branch information
@J-N-K @andrasU
J-N-K authored and andrasU committed Dec 24, 2022
1 parent 989aca3 commit 48f6ecb
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 38 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '17' ]
java: [ '17' ]
maven: [ '3.8.6' ]
os: [ 'ubuntu-22.04' ]
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
maven-version: ${{ matrix.maven }}

- name: Register Problem Matchers
if: ${{ matrix.java == '11' }}
if: ${{ matrix.java == '17' }}
id: problem_matchers
run: |
echo "::add-matcher::.github/openhab-compile-problems.json"
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
path: target/summary_report.html

- name: Report SAT Errors as Annotations
if: ${{ matrix.java == '11' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: ghys/checkstyle-github-action@main
with:
title: CheckStyle Violations
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Fragment-Host: org.openhab.binding.astro
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
Expand All @@ -50,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.storage.json;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
6 changes: 3 additions & 3 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ Fragment-Host: org.openhab.binding.avmfritz
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
Expand Down Expand Up @@ -77,4 +75,6 @@ Fragment-Host: org.openhab.binding.avmfritz
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'
6 changes: 3 additions & 3 deletions itests/org.openhab.binding.feed.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ Fragment-Host: org.openhab.binding.feed
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
Expand Down Expand Up @@ -77,4 +75,6 @@ Fragment-Host: org.openhab.binding.feed
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Fragment-Host: org.openhab.binding.hue
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
Expand Down Expand Up @@ -81,4 +80,5 @@ Fragment-Host: org.openhab.binding.hue
org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.max.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Fragment-Host: org.openhab.binding.max
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
Expand All @@ -68,4 +67,5 @@ Fragment-Host: org.openhab.binding.max
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
6 changes: 3 additions & 3 deletions itests/org.openhab.binding.mielecloud.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ Fragment-Host: org.openhab.binding.mielecloud
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
Expand Down Expand Up @@ -87,4 +85,6 @@ Fragment-Host: org.openhab.binding.mielecloud
org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.modbus.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Fragment-Host: org.openhab.binding.modbus
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
Expand All @@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.modbus
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)'
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Import-Package: \
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
com.google.dagger;version='[2.27.0,2.27.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
io.netty.buffer;version='[4.1.72,4.1.73)',\
io.netty.codec;version='[4.1.72,4.1.73)',\
Expand Down Expand Up @@ -112,4 +111,5 @@ Import-Package: \
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)'
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Import-Package: \
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
com.google.dagger;version='[2.27.0,2.27.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
io.netty.buffer;version='[4.1.72,4.1.73)',\
io.netty.codec;version='[4.1.72,4.1.73)',\
Expand Down Expand Up @@ -112,5 +111,6 @@ Import-Package: \
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)'
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

6 changes: 3 additions & 3 deletions itests/org.openhab.binding.nest.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ Fragment-Host: org.openhab.binding.nest
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
Expand Down Expand Up @@ -107,4 +105,6 @@ Fragment-Host: org.openhab.binding.nest
org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.ntp.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Fragment-Host: org.openhab.binding.ntp
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
Expand All @@ -72,4 +71,5 @@ Fragment-Host: org.openhab.binding.ntp
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Fragment-Host: org.openhab.binding.systeminfo
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
Expand All @@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.systeminfo
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
4 changes: 2 additions & 2 deletions itests/org.openhab.binding.tradfri.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ Fragment-Host: org.openhab.binding.tradfri
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
Expand Down Expand Up @@ -79,4 +78,5 @@ Fragment-Host: org.openhab.binding.tradfri
org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'
6 changes: 3 additions & 3 deletions itests/org.openhab.binding.wemo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ Fragment-Host: org.openhab.binding.wemo
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
Expand Down Expand Up @@ -85,4 +83,6 @@ Fragment-Host: org.openhab.binding.wemo
org.openhab.core.io.transport.upnp;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'
4 changes: 2 additions & 2 deletions itests/org.openhab.persistence.mapdb.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Fragment-Host: org.openhab.persistence.mapdb
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
Expand All @@ -59,4 +58,5 @@ Fragment-Host: org.openhab.persistence.mapdb
org.openhab.core.persistence;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.persistence.mapdb;version='[4.0.0,4.0.1)',\
org.openhab.persistence.mapdb.tests;version='[4.0.0,4.0.1)'
org.openhab.persistence.mapdb.tests;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

0 comments on commit 48f6ecb

Please sign in to comment.