From 12e472ac9dce41cebdd6f85ef53ac6879e0452f0 Mon Sep 17 00:00:00 2001 From: Florian Hotze Date: Tue, 3 Jun 2025 21:47:51 +0200 Subject: [PATCH] [mqtt.homeassistant] Fix itest dependencies (#18752) * [mqtt.homeassistant] Fix itest dependencies Signed-off-by: Florian Hotze --- .../pom.xml | 6 --- .../itest.bndrun | 27 +++++++--- .../pom.xml | 50 +++++++++++++++++++ 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml index a66f90d5157..3829b6f2dd0 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml @@ -15,12 +15,6 @@ openHAB Add-ons :: Bundles :: MQTT HomeAssistant Convention - !sun.misc.*, - !sun.reflect.*, - !com.sun.management.*, - !jdk.internal.reflect.*, - !jdk.vm.ci.services - 24.2.0 bin/python3 diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 3f5f97fdd25..b3575745536 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -25,6 +25,10 @@ Import-Package: \ # # done # + +# Note: +# Do NOT add org.apache.servicemix.specs.stax-api-1.2 or stax2-api as runbundle, +# as they break the CI build causing issues with GraalPy -runbundles: \ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ org.hamcrest;version='[3.0.0,3.0.1)',\ @@ -106,24 +110,35 @@ Import-Package: \ org.openhab.binding.mqtt.homeassistant.tests;version='[5.0.0,5.0.1)',\ org.openhab.core;version='[5.0.0,5.0.1)',\ org.openhab.core.addon;version='[5.0.0,5.0.1)',\ + org.openhab.core.automation;version='[5.0.0,5.0.1)',\ + org.openhab.core.automation.module.script;version='[5.0.0,5.0.1)',\ org.openhab.core.config.core;version='[5.0.0,5.0.1)',\ org.openhab.core.config.discovery;version='[5.0.0,5.0.1)',\ + org.openhab.core.ephemeris;version='[5.0.0,5.0.1)',\ org.openhab.core.io.console;version='[5.0.0,5.0.1)',\ org.openhab.core.io.transport.mqtt;version='[5.0.0,5.0.1)',\ + org.openhab.core.semantics;version='[5.0.0,5.0.1)',\ org.openhab.core.test;version='[5.0.0,5.0.1)',\ org.openhab.core.thing;version='[5.0.0,5.0.1)',\ org.openhab.core.transform;version='[5.0.0,5.0.1)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.18.2,2.18.3)',\ com.fasterxml.jackson.core.jackson-core;version='[2.18.2,2.18.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.18.2,2.18.3)',\ - com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ - javassist;version='[3.30.2,3.30.3)',\ - org.apache.commons.commons-net;version='[3.11.1,3.11.2)',\ - org.apache.commons.lang3;version='[3.17.0,3.17.1)',\ org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\ - com.google.guava;version='[33.3.1,33.3.2)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.2,2.18.3)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ - jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)' \ No newline at end of file + jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\ + de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\ + de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\ + org.threeten.extra;version='[1.8.0,1.8.1)',\ + org.graalvm.sdk.collections;bundle-version="24.2.0",\ + org.graalvm.sdk.jniutils;bundle-version="24.2.0",\ + org.graalvm.sdk.nativeimage;bundle-version="24.2.0",\ + org.graalvm.sdk.word;bundle-version="24.2.0",\ + org.graalvm.shadowed.icu4j;bundle-version="24.2.0",\ + org.graalvm.shadowed.xz;bundle-version="24.2.0",\ + org.graalvm.truffle.truffle-compiler;bundle-version="24.2.0",\ + org.graalvm.truffle.truffle-runtime;bundle-version="24.2.0" diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml index ee79cb57974..dad32e5b841 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml @@ -16,9 +16,59 @@ 1883 + 24.2.0 + + org.openhab.osgiify + org.graalvm.sdk.collections + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.sdk.jniutils + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.sdk.nativeimage + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.sdk.word + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.shadowed.icu4j + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.shadowed.xz + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.truffle.truffle-compiler + ${graalpy.version} + compile + + + org.openhab.osgiify + org.graalvm.truffle.truffle-runtime + ${graalpy.version} + compile + + org.openhab.addons.bundles org.openhab.binding.mqtt