From c0765981f694329c2c0506fa4360bc10b560d338 Mon Sep 17 00:00:00 2001 From: "Jan N. Klug" Date: Tue, 3 Jan 2023 21:17:44 +0100 Subject: [PATCH] fix Signed-off-by: Jan N. Klug --- .../core/io/rest/core/internal/CertificateResource.java | 2 +- .../core/io/rest/core/internal/CertificateResourceTest.java | 2 +- itests/org.openhab.core.io.rest.core.tests/itest.bndrun | 3 ++- itests/org.openhab.core.model.core.tests/itest.bndrun | 4 +++- itests/org.openhab.core.model.item.tests/itest.bndrun | 3 ++- itests/org.openhab.core.model.rule.tests/itest.bndrun | 4 +++- itests/org.openhab.core.model.script.tests/itest.bndrun | 4 +++- itests/org.openhab.core.model.thing.tests/itest.bndrun | 3 ++- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/CertificateResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/CertificateResource.java index e4c3df04f0a..650f34b3b03 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/CertificateResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/CertificateResource.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010-2022 Contributors to the openHAB project + * Copyright (c) 2010-2023 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional * information. diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/CertificateResourceTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/CertificateResourceTest.java index 764db5ed0d8..03483fb8c12 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/CertificateResourceTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/CertificateResourceTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010-2022 Contributors to the openHAB project + * Copyright (c) 2010-2023 Contributors to the openHAB project * * See the NOTICE file(s) distributed with this work for additional * information. diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 0e5def6cf24..8a49561705f 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -101,4 +101,5 @@ Fragment-Host: org.openhab.core.io.rest.core org.openhab.core.transform;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)',\ - com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)' + com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\ + org.openhab.core.io.jetty.certificate;version='[4.0.0,4.0.1)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index d1028e5099a..9c6757a9079 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -110,4 +110,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ - org.objectweb.asm;version='[9.4.0,9.4.1)' + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.apache.log4j;version='[1.2.19,1.2.20)',\ + org.openhab.core.model.item.runtime;version='[4.0.0,4.0.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index f8662cbd777..5b6c2e7c4ea 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -108,4 +108,5 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ - org.objectweb.asm;version='[9.4.0,9.4.1)' + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.apache.log4j;version='[1.2.19,1.2.20)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index a1eaa70cffd..35859cee9f4 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -109,5 +109,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ - org.objectweb.asm;version='[9.4.0,9.4.1)' + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.apache.log4j;version='[1.2.19,1.2.20)',\ + org.openhab.core.model.item.runtime;version='[4.0.0,4.0.1)' -runblacklist: bnd.identity;id='jakarta.activation-api' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 4c4db2a3975..0ad2158143a 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -110,4 +110,6 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ - org.objectweb.asm;version='[9.4.0,9.4.1)' + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.apache.log4j;version='[1.2.19,1.2.20)',\ + org.openhab.core.model.item.runtime;version='[4.0.0,4.0.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 36b7c226bc4..996571b1f75 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -121,4 +121,5 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ - org.objectweb.asm;version='[9.4.0,9.4.1)' + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.apache.log4j;version='[1.2.19,1.2.20)'