diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index 278ac411205..26712fe5ec4 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -30,7 +30,7 @@ org.eclipse.xtext - org.eclipse.xtext.generator + org.eclipse.xtext.xtext.generator ${xtext.version} compile @@ -132,9 +132,9 @@ - org.eclipse.orbit.bundles - io.github.classgraph - 4.8.149.v20220915-0556 + io.github.classgraph + classgraph + 4.8.165 compile diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index c9fdc6d3f9e..a7618188afb 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -18,8 +18,8 @@ 2.7.4 - 9.4.52.v20230823 - 8.0.22 + 9.4.53.v20231009 + 8.0.24 2.2.15 @@ -84,7 +84,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 compile @@ -418,13 +418,13 @@ net.java.dev.jna jna - 5.13.0 + 5.14.0 compile net.java.dev.jna jna-platform - 5.13.0 + 5.14.0 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 04e7e72e66f..6266b67fbc1 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -19,9 +19,9 @@ 2.7.4 3.6.2 2.16.0 - 9.4.52.v20230823 - 2.2.3 - 8.0.22 + 9.4.53.v20231009 + 2.2.6 + 8.0.24 2.2.15 @@ -326,7 +326,7 @@ org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle - 1.3.6 + 1.3.7 @@ -404,12 +404,12 @@ commons-io commons-io - 2.13.0 + 2.15.1 org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 compile @@ -780,13 +780,13 @@ org.apache.xbean xbean-bundleutils - 4.23 + 4.24 compile org.apache.xbean xbean-finder - 4.23 + 4.24 compile @@ -794,7 +794,7 @@ com.google.guava guava - 32.1.2-jre + 33.0.0-jre compile @@ -806,9 +806,9 @@ compile - org.eclipse.orbit.bundles - io.github.classgraph - 4.8.149.v20220915-0556 + io.github.classgraph + classgraph + 4.8.165 compile @@ -906,6 +906,7 @@ org.ow2.asm asm + 9.6 compile @@ -1065,13 +1066,13 @@ net.java.dev.jna jna - 5.13.0 + 5.14.0 compile net.java.dev.jna jna-platform - 5.13.0 + 5.14.0 compile diff --git a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml index 59a092e7d41..72af12d984d 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/pom.xml @@ -23,7 +23,7 @@ net.java.dev.jna jna-platform - 5.13.0 + 5.14.0 diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd index 8c79e0cc7ff..d11180b2511 100644 --- a/bundles/org.openhab.core.model.item/bnd.bnd +++ b/bundles/org.openhab.core.model.item/bnd.bnd @@ -38,10 +38,9 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\ org.eclipse.emf.ecore;visibility:=reexport,\ org.eclipse.emf.mwe.utils;resolution:=optional,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext,\ org.eclipse.xtext.common.types,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0" + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0" diff --git a/bundles/org.openhab.core.model.lazygen/.classpath b/bundles/org.openhab.core.model.lazygen/.classpath deleted file mode 100644 index faeb20a5799..00000000000 --- a/bundles/org.openhab.core.model.lazygen/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.core.model.lazygen/.project b/bundles/org.openhab.core.model.lazygen/.project deleted file mode 100644 index c128caf2917..00000000000 --- a/bundles/org.openhab.core.model.lazygen/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.openhab.core.model.lazygen - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/bundles/org.openhab.core.model.lazygen/NOTICE b/bundles/org.openhab.core.model.lazygen/NOTICE deleted file mode 100644 index 6c17d0d8a45..00000000000 --- a/bundles/org.openhab.core.model.lazygen/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -This content is produced and maintained by the openHAB project. - -* Project home: https://www.openhab.org - -== Declared Project Licenses - -This program and the accompanying materials are made available under the terms -of the Eclipse Public License 2.0 which is available at -https://www.eclipse.org/legal/epl-2.0/. - -== Source Code - -https://github.com/openhab/openhab-core - diff --git a/bundles/org.openhab.core.model.lazygen/model.profile-marker b/bundles/org.openhab.core.model.lazygen/model.profile-marker deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/bundles/org.openhab.core.model.lazygen/pom.xml b/bundles/org.openhab.core.model.lazygen/pom.xml deleted file mode 100644 index d6880a8fca5..00000000000 --- a/bundles/org.openhab.core.model.lazygen/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - 4.0.0 - - - org.openhab.core.bundles - org.openhab.core.reactor.bundles - 4.2.0-SNAPSHOT - - - org.openhab.core.model.lazygen - - openHAB Core :: Bundles :: Model Lazy Generation - - diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java deleted file mode 100644 index 729f13df4b1..00000000000 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2010-2024 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.model.lazygen; - -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.xtext.resource.XtextResourceSet; - -/** - * - * @author Holger Schill, Simon Kaufmann - Initial contribution - */ -@NonNullByDefault -public class GlobalResourceSet { - - public static ResourceSet getINSTANCE() { - return new XtextResourceSet(); - } -} diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java deleted file mode 100644 index dd292bbc8fe..00000000000 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2010-2024 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.model.lazygen; - -import org.eclipse.emf.mwe.core.WorkflowContext; -import org.eclipse.emf.mwe.core.issues.Issues; -import org.eclipse.emf.mwe.core.monitor.ProgressMonitor; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.xtext.generator.Generator; - -/** - * - * @author Holger Schill, Simon Kaufmann - Initial contribution - */ -@NonNullByDefault -public class LazyGenerator extends Generator { - - @Nullable - LazyLanguageConfig langConfig = null; - - public void addLazyLanguage(LazyLanguageConfig langConfig) { - this.langConfig = langConfig; - super.addLanguage(langConfig); - } - - @Override - protected void invokeInternal(@NonNullByDefault({}) WorkflowContext ctx, - @NonNullByDefault({}) ProgressMonitor monitor, @NonNullByDefault({}) Issues issues) { - super.checkConfigurationInternal(issues); - super.invokeInternal(ctx, monitor, issues); - } - - @Override - protected void checkConfigurationInternal(@NonNullByDefault({}) Issues issues) { - } -} diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java deleted file mode 100644 index 90493da3443..00000000000 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * Copyright (c) 2010-2024 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.model.lazygen; - -import static org.eclipse.xtext.util.Strings.equal; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.xpand2.XpandExecutionContext; -import org.eclipse.xtext.Grammar; -import org.eclipse.xtext.ecore.EcoreSupportStandaloneSetup; -import org.eclipse.xtext.generator.CompositeGeneratorException; -import org.eclipse.xtext.generator.LanguageConfig; -import org.eclipse.xtext.resource.IResourceServiceProvider; -import org.eclipse.xtext.resource.XtextResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * - * @author Holger Schill, Simon Kaufmann - Initial contribution - */ -@NonNullByDefault -public class LazyLanguageConfig extends LanguageConfig { - - private final Logger logger = LoggerFactory.getLogger(LazyLanguageConfig.class); - @Nullable - String uri = null; - boolean isUI = false; - - @Override - public void setUri(@Nullable String uri) { - this.uri = uri; - } - - private @Nullable Grammar grammar; - - @Override - public @Nullable Grammar getGrammar() { - setUriReally(uri); - return grammar; - } - - @Override - public void initialize(boolean isUi) { - this.isUI = isUi; - } - - public void initializeReally() { - super.initialize(isUI); - } - - @Override - protected void validateGrammar(@NonNullByDefault({}) Grammar grammar) { - } - - @Override - public void generate(@NonNullByDefault({}) Grammar grammar, @NonNullByDefault({}) XpandExecutionContext ctx) { - initializeReally(); - super.generate(grammar, ctx); - } - - @Override - public void generate(@NonNullByDefault({}) LanguageConfig config, @NonNullByDefault({}) XpandExecutionContext ctx) - throws CompositeGeneratorException { - initializeReally(); - super.generate(config, ctx); - } - - public void setUriReally(@Nullable String uri) { - ResourceSet rs = GlobalResourceSet.getINSTANCE(); - for (String loadedResource : getLoadedResources()) { - URI loadedResourceUri = URI.createURI(loadedResource); - if (equal(loadedResourceUri.fileExtension(), "ecore")) { - IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE - .getResourceServiceProvider(loadedResourceUri); - if (resourceServiceProvider == null) { - EcoreSupportStandaloneSetup.setup(); - } - } else if (equal(loadedResourceUri.fileExtension(), "xcore")) { - IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE - .getResourceServiceProvider(loadedResourceUri); - if (resourceServiceProvider == null) { - try { - Class xcore = Class.forName("org.eclipse.emf.ecore.xcore.XcoreStandaloneSetup"); - xcore.getDeclaredMethod("doSetup", new Class[0]).invoke(null); - } catch (ClassNotFoundException e) { - logger.error("Couldn't initialize Xcore support. Is it on the classpath?"); - } catch (Exception e) { - logger.error("Couldn't initialize Xcore support.", e); - } - } - } - Resource res = rs.getResource(loadedResourceUri, true); - if (res == null || res.getContents().isEmpty()) { - logger.error("Error loading '{}'", loadedResource); - } else if (!res.getErrors().isEmpty()) { - logger.error("Error loading '{}': {}", loadedResource, res.getErrors()); - } - } - EcoreUtil.resolveAll(rs); - XtextResource resource = (XtextResource) rs.getResource(URI.createURI(uri), true); - if (resource.getContents().isEmpty()) { - throw new IllegalArgumentException("Couldn't load grammar for '" + uri + "'."); - } - if (!resource.getErrors().isEmpty()) { - logger.error("Error loading '{}': {}", uri, resource.getErrors()); - throw new IllegalStateException("Problem parsing '" + uri + "':" + resource.getErrors().toString()); - } - - final Grammar grammar = (Grammar) resource.getContents().get(0); - validateGrammar(grammar); - this.grammar = grammar; - } -} diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java deleted file mode 100644 index 4a5195f5dde..00000000000 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java +++ /dev/null @@ -1,153 +0,0 @@ -/** - * Copyright (c) 2010-2024 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.core.model.lazygen; - -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EPackage.Registry; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.mwe.core.ConfigurationException; -import org.eclipse.emf.mwe.core.WorkflowContext; -import org.eclipse.emf.mwe.core.issues.Issues; -import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2; -import org.eclipse.emf.mwe.core.monitor.ProgressMonitor; -import org.eclipse.emf.mwe.core.resources.ResourceLoaderFactory; -import org.eclipse.emf.mwe.utils.GenModelHelper; -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * - * @author Holger Schill, Simon Kaufmann - Initial contribution - */ -@NonNullByDefault -public class LazyStandaloneSetup extends AbstractWorkflowComponent2 { - - private static ResourceSet resourceSet = GlobalResourceSet.getINSTANCE(); - private final Registry registry = EPackage.Registry.INSTANCE; - - Set allgeneratedEPackages = new HashSet<>(); - Set allGenModelFiles = new HashSet<>(); - Set allEcoreFiles = new HashSet<>(); - - public void addGeneratedPackage(String packageName) { - allgeneratedEPackages.add(packageName); - } - - public void addGenModelFile(String modelFile) { - allGenModelFiles.add(modelFile); - } - - public void addEcoreModelFile(String modelFile) { - allEcoreFiles.add(modelFile); - } - - @Override - protected void invokeInternal(@NonNullByDefault({}) WorkflowContext ctx, - @NonNullByDefault({}) ProgressMonitor monitor, @NonNullByDefault({}) Issues issues) { - for (String generatedEPackage : allgeneratedEPackages) { - addRegisterGeneratedEPackage(generatedEPackage); - } - for (String genModelFile : allGenModelFiles) { - addRegisterGenModelFile(genModelFile); - } - for (String ecoreFile : allEcoreFiles) { - addRegisterEcoreFile(ecoreFile); - } - } - - private final Logger logger = LoggerFactory.getLogger(LazyStandaloneSetup.class); - - private void addRegisterGeneratedEPackage(String interfacename) { - Class clazz = ResourceLoaderFactory.createResourceLoader().loadClass(interfacename); - if (clazz == null) { - throw new ConfigurationException("Couldn't find an interface " + interfacename); - } - try { - EPackage pack = (EPackage) clazz.getDeclaredField("eINSTANCE").get(null); - if (registry.get(pack.getNsURI()) == null) { - registry.put(pack.getNsURI(), pack); - logger.info("Adding generated EPackage '{}'", interfacename); - } - } catch (Exception e) { - throw new ConfigurationException("Couldn't register " + interfacename - + ". Is it the generated EPackage interface? : " + e.getMessage()); - } - } - - private void addRegisterEcoreFile(String fileName) throws IllegalArgumentException, SecurityException { - Resource res = resourceSet.getResource(createURI(fileName), true); - if (res == null) { - throw new ConfigurationException("Couldn't find resource under " + fileName); - } - if (!res.isLoaded()) { - try { - res.load(null); - } catch (IOException e) { - throw new ConfigurationException("Couldn't load resource under " + fileName + " : " + e.getMessage()); - } - } - List result = res.getContents(); - for (EObject object : result) { - if (object instanceof EPackage) { - registerPackage(fileName, object); - } - for (final TreeIterator it = object.eAllContents(); it.hasNext();) { - EObject child = it.next(); - if (child instanceof EPackage) { - registerPackage(fileName, child); - } - } - } - } - - private GenModelHelper createGenModelHelper() { - return new GenModelHelper(); - } - - private void addRegisterGenModelFile(String fileName) { - createGenModelHelper().registerGenModel(resourceSet, createURI(fileName)); - } - - private void registerPackage(String fileName, EObject object) { - String nsUri = ((EPackage) object).getNsURI(); - if (registry.get(nsUri) == null) { - registry.put(nsUri, object); - logger.info("Adding dynamic EPackage '{}' from '{}'", nsUri, fileName); - } else if (logger.isDebugEnabled()) { - logger.debug("Dynamic EPackage '{}' from '{}' already in the registry!", nsUri, fileName); - } - } - - private URI createURI(String path) { - if (path == null) { - throw new IllegalArgumentException(); - } - - URI uri = URI.createURI(path); - if (uri.isRelative()) { - return URI.createFileURI(new File(path).getAbsolutePath()); - } - return uri; - } -} diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd index c5067b3cc13..23accce9905 100644 --- a/bundles/org.openhab.core.model.persistence/bnd.bnd +++ b/bundles/org.openhab.core.model.persistence/bnd.bnd @@ -38,11 +38,10 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.emf.mwe.utils;resolution:=optional,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ org.openhab.core.model.item,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext.common.types,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ - org.eclipse.xtext.xbase;bundle-version="2.26.0";resolution:=optional;visibility:=reexport,\ - org.eclipse.xtext;bundle-version="2.26.0";visibility:=reexport + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\ + org.eclipse.xtext.xbase;bundle-version="2.34.0";resolution:=optional;visibility:=reexport,\ + org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd index c973a0821a2..5c6e0030e1a 100644 --- a/bundles/org.openhab.core.model.rule/bnd.bnd +++ b/bundles/org.openhab.core.model.rule/bnd.bnd @@ -43,13 +43,12 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.emf.ecore,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ org.openhab.core.model.item,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.openhab.core.model.script,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext.common.types,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ org.eclipse.xtext.xbase,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\ org.eclipse.xtext;visibility:=reexport,\ org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd index dad83d472e7..8ea9d5d90be 100644 --- a/bundles/org.openhab.core.model.script/bnd.bnd +++ b/bundles/org.openhab.core.model.script/bnd.bnd @@ -61,12 +61,11 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.emf.ecore,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ org.openhab.core.model.item,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext.common.types,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\ org.eclipse.xtext.xbase;visibility:=reexport,\ org.eclipse.xtext;visibility:=reexport,\ org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd index c2f383fbccb..08b21881f9e 100644 --- a/bundles/org.openhab.core.model.sitemap/bnd.bnd +++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd @@ -23,9 +23,8 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.emf.common,\ org.eclipse.emf.ecore,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0" + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0" diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd index 9705a3d6e5a..c1bfc49cfd8 100644 --- a/bundles/org.openhab.core.model.thing/bnd.bnd +++ b/bundles/org.openhab.core.model.thing/bnd.bnd @@ -40,12 +40,11 @@ Require-Bundle: org.antlr.runtime,\ org.eclipse.emf.ecore,\ org.eclipse.emf.mwe.utils;resolution:=optional,\ org.eclipse.emf.mwe2.launch;resolution:=optional,\ - org.openhab.core.model.lazygen;resolution:=optional,\ org.eclipse.xtend.lib;resolution:=optional,\ org.eclipse.xtext.common.types,\ - org.eclipse.xtext.generator;resolution:=optional,\ + org.eclipse.xtext.xtext.generator;resolution:=optional,\ org.eclipse.xtext.util,\ - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",\ + org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",\ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,\ org.eclipse.xtext;visibility:=reexport,\ org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional diff --git a/bundles/org.openhab.core.semantics/pom.xml b/bundles/org.openhab.core.semantics/pom.xml index 30f409f0257..45223d92fea 100644 --- a/bundles/org.openhab.core.semantics/pom.xml +++ b/bundles/org.openhab.core.semantics/pom.xml @@ -29,7 +29,7 @@ org.ow2.asm asm - 9.4 + 9.6 provided diff --git a/bundles/pom.xml b/bundles/pom.xml index de659616c7c..92b8cca3683 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -86,7 +86,6 @@ org.openhab.core.io.transport.upnp org.openhab.core.io.websocket org.openhab.core.io.jetty.certificate - org.openhab.core.model.lazygen org.openhab.core.model.core org.openhab.core.model.item org.openhab.core.model.item.ide diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml index 08f92918f2f..79dee928e94 100644 --- a/features/karaf/openhab-core/pom.xml +++ b/features/karaf/openhab-core/pom.xml @@ -16,8 +16,8 @@ openHAB Core Features - 9.4.52.v20230823 - 5.13.0 + 9.4.53.v20231009 + 5.14.0 diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index 94d766da68a..ab4089ad00c 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -28,7 +28,7 @@ openhab.tp-gson - openhab.tp;filter:="(&(feature=xtext)(version>=2.32.0)(!(version>=2.33.0)))" + openhab.tp;filter:="(&(feature=xtext)(version>=2.34.0)(!(version>=2.35.0)))" openhab.tp-xtext openhab.tp;filter:="(feature=jax-rs-whiteboard)" @@ -389,10 +389,10 @@ - openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.32.0)(!(version>=2.33.0)))" + openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.34.0)(!(version>=2.35.0)))" openhab.tp-xtext-ide - openhab.tp;filter:="(&(feature=lsp4j)(version>=0.21.0)(!(version>=0.22.0)))" + openhab.tp;filter:="(&(feature=lsp4j)(version>=0.22.0)(!(version>=0.23.0)))" openhab.tp-lsp4j openhab-core-model-item-ide diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml index 90d6024b999..a508da93e04 100644 --- a/features/karaf/openhab-tp/pom.xml +++ b/features/karaf/openhab-tp/pom.xml @@ -15,8 +15,8 @@ openHAB Core :: Features :: Karaf :: Target Platform - 9.4.52.v20230823 - 5.13.0 + 9.4.53.v20231009 + 5.14.0 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 77483ea8410..8f75a304af3 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -23,7 +23,7 @@ log pax-web-jetty-extras - mvn:org.apache.commons/commons-lang3/3.12.0 + mvn:org.apache.commons/commons-lang3/3.14.0 mvn:jakarta.annotation/jakarta.annotation-api/2.0.0 mvn:jakarta.inject/jakarta.inject-api/1.0.5 @@ -205,9 +205,9 @@ - openhab.tp;feature=lsp4j;version=0.21.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.21.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.21.0 + openhab.tp;feature=lsp4j;version=0.22.0 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.22.0 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.22.0 openhab.tp-gson openhab.tp-xtext @@ -246,13 +246,13 @@ mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version} mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version} - mvn:com.google.guava/failureaccess/1.0.1 - mvn:com.google.guava/guava/32.1.2-jre + mvn:com.google.guava/failureaccess/1.0.2 + mvn:com.google.guava/guava/33.0.0-jre mvn:com.google.inject/guice/7.0.0 mvn:jakarta.inject/jakarta.inject-api/2.0.1 mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816 - mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556 + mvn:io.github.classgraph/classgraph/4.8.165 mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130 mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index af41e76de0c..abc1717832f 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core.addon tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -67,4 +52,19 @@ Fragment-Host: org.openhab.core.addon org.openhab.core.addon;version='[4.2.0,4.2.1)',\ org.openhab.core.addon.tests;version='[4.2.0,4.2.1)',\ org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ - org.openhab.core.test;version='[4.2.0,4.2.1)' + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index b84bf10a548..57381301e84 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -32,35 +32,12 @@ Fragment-Host: org.openhab.core.auth.oauth2client tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -78,5 +55,27 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.openhab.core.test;version='[4.2.0,4.2.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - xstream;version='[1.4.20,1.4.21)' + xstream;version='[1.4.20,1.4.21)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index c8bf7e49174..286201ffbf3 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core.automation tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -82,4 +67,18 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index c87aeafcd3c..b132ffa5205 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core.automation tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -82,4 +67,18 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 8072e85c2ec..3f4d13b4786 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -29,27 +29,12 @@ Fragment-Host: org.openhab.core.automation.module.script tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -79,4 +64,18 @@ Fragment-Host: org.openhab.core.automation.module.script de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index a11333bd549..7865f619abb 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core.automation tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -82,4 +67,18 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 4e1e2bbe75e..561d78dce86 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core.automation tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -82,4 +67,18 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index e92923d8d06..19962bfde8b 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -35,27 +35,12 @@ Fragment-Host: org.openhab.core.config.core tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -68,4 +53,19 @@ Fragment-Host: org.openhab.core.config.core org.openhab.core;version='[4.2.0,4.2.1)',\ org.openhab.core.config.core;version='[4.2.0,4.2.1)',\ org.openhab.core.config.core.tests;version='[4.2.0,4.2.1)',\ - org.openhab.core.test;version='[4.2.0,4.2.1)' + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index a74a1ba2976..bb586afc63b 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -34,27 +34,12 @@ Fragment-Host: org.openhab.core.config.discovery.mdns tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -76,4 +61,18 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 49c83c695b8..bfa4c155f95 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -35,27 +35,12 @@ Fragment-Host: org.openhab.core.config.discovery tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -75,4 +60,18 @@ Fragment-Host: org.openhab.core.config.discovery org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 917265cf2a3..45c7820e01d 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -34,27 +34,12 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -76,4 +61,19 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + org.osgi.service.cm;version='[1.6.0,1.6.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index b018cd45e45..37018b995c6 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -43,27 +43,12 @@ Provide-Capability: \ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -84,4 +69,18 @@ Provide-Capability: \ org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index d0c407217a9..6a5e39c2b49 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -28,27 +28,12 @@ Fragment-Host: org.openhab.core.config.dispatch tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -61,4 +46,19 @@ Fragment-Host: org.openhab.core.config.dispatch org.openhab.core;version='[4.2.0,4.2.1)',\ org.openhab.core.config.dispatch;version='[4.2.0,4.2.1)',\ org.openhab.core.config.dispatch.tests;version='[4.2.0,4.2.1)',\ - org.openhab.core.test;version='[4.2.0,4.2.1)' + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 48062baabc4..eb511a80643 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -34,27 +34,12 @@ feature.openhab-config: \ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -76,4 +61,19 @@ feature.openhab-config: \ org.threeten.extra;version='[1.7.2,1.7.3)',\ stax2-api;version='[4.2.1,4.2.2)',\ de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ - de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)' + de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 978363b73ae..91cd347b369 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -23,44 +23,18 @@ Fragment-Host: org.openhab.core.io.net org.osgi.util.function;version='[1.2.0,1.2.1)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.servlet;version='[9.4.52,9.4.53)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -73,4 +47,30 @@ Fragment-Host: org.openhab.core.io.net org.openhab.core;version='[4.2.0,4.2.1)',\ org.openhab.core.io.net;version='[4.2.0,4.2.1)',\ org.openhab.core.io.net.tests;version='[4.2.0,4.2.1)',\ - org.openhab.core.test;version='[4.2.0,4.2.1)' + org.openhab.core.test;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.servlet;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' 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 b5c3a2c37b2..cc14c4deccd 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -36,11 +36,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ @@ -48,30 +43,13 @@ Fragment-Host: org.openhab.core.io.rest.core uom-lib-common;version='[2.2.0,2.2.1)',\ com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\ org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\ @@ -106,4 +84,26 @@ Fragment-Host: org.openhab.core.io.rest.core org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ json-path;version='[2.9.0,2.9.1)',\ net.minidev.accessors-smart;version='[2.5.0,2.5.1)',\ - net.minidev.json-smart;version='[2.5.0,2.5.1)' + net.minidev.json-smart;version='[2.5.0,2.5.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 28eb6ab1c72..fd4657295f6 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.core.model.item org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -25,7 +24,6 @@ Fragment-Host: org.openhab.core.model.item si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ @@ -35,54 +33,16 @@ Fragment-Host: org.openhab.core.model.item tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[32.1.2,32.1.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ - org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\ - org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -126,6 +86,47 @@ Fragment-Host: org.openhab.core.model.item stax2-api;version='[4.2.1,4.2.2)',\ de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ - org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.google.guava;version='[33.0.0,33.0.1)',\ + com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ + org.apache.log4j;version='[1.2.25,1.2.26)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\ + org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 88445ccaea6..74f9995d0f9 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -18,8 +18,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -29,7 +27,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -40,54 +37,16 @@ Fragment-Host: org.openhab.core.model.rule.runtime tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[32.1.2,32.1.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ - org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\ - org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -132,5 +91,45 @@ Fragment-Host: org.openhab.core.model.rule.runtime de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.openhab.core.model.item.runtime;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.google.guava;version='[33.0.0,33.0.1)',\ + com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.apache.log4j;version='[1.2.25,1.2.26)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\ + org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 10890b61e81..3669fb05ac8 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -18,7 +18,6 @@ Fragment-Host: org.openhab.core.model.script org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -28,7 +27,6 @@ Fragment-Host: org.openhab.core.model.script si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -44,54 +42,16 @@ Fragment-Host: org.openhab.core.model.script tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[32.1.2,32.1.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ - org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\ - org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -135,4 +95,45 @@ Fragment-Host: org.openhab.core.model.script de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.openhab.core.model.item.runtime;version='[4.2.0,4.2.1)' + com.google.guava;version='[33.0.0,33.0.1)',\ + com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.apache.log4j;version='[1.2.25,1.2.26)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\ + org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index dbcc702da38..43dc78dbeed 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.model.thing org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -26,7 +25,6 @@ Fragment-Host: org.openhab.core.model.thing si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ @@ -41,54 +39,16 @@ Fragment-Host: org.openhab.core.model.thing tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[32.1.2,32.1.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ - org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\ - org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -135,6 +95,47 @@ Fragment-Host: org.openhab.core.model.thing stax2-api;version='[4.2.1,4.2.2)',\ de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ - org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.google.guava;version='[33.0.0,33.0.1)',\ + com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ + org.apache.log4j;version='[1.2.25,1.2.26)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\ + org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 451cdf2ebb4..3572f30dc44 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -29,27 +29,12 @@ Fragment-Host: org.openhab.core.storage.json tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -69,4 +54,18 @@ Fragment-Host: org.openhab.core.storage.json org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.openhab.core.addon;version='[4.2.0,4.2.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 7b768ed653b..bf682a5f1b8 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -33,27 +33,12 @@ Fragment-Host: org.openhab.core tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -65,4 +50,19 @@ Fragment-Host: org.openhab.core ch.qos.logback.core;version='[1.3.14,1.3.15)',\ org.openhab.core;version='[4.2.0,4.2.1)',\ org.openhab.core.test;version='[4.2.0,4.2.1)',\ - org.openhab.core.tests;version='[4.2.0,4.2.1)' + org.openhab.core.tests;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 3264b3ca4cc..66463667312 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -38,27 +38,12 @@ Fragment-Host: org.openhab.core.thing tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -76,4 +61,19 @@ Fragment-Host: org.openhab.core.thing org.openhab.core.thing.tests;version='[4.2.0,4.2.1)',\ org.openhab.core.transform;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ - org.openhab.core.addon;version='[4.2.0,4.2.1)' + org.openhab.core.addon;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 1860d572946..7c6a2554476 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -33,34 +33,12 @@ Fragment-Host: org.openhab.core.voice tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)',\ biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ @@ -81,4 +59,26 @@ Fragment-Host: org.openhab.core.voice org.openhab.core.voice;version='[4.2.0,4.2.1)',\ org.openhab.core.voice.tests;version='[4.2.0,4.2.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ - org.openhab.core.addon;version='[4.2.0,4.2.1)' + org.openhab.core.addon;version='[4.2.0,4.2.1)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.objectweb.asm;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/pom.xml b/pom.xml index 5231e528330..d8814e8d0be 100644 --- a/pom.xml +++ b/pom.xml @@ -72,11 +72,11 @@ 7.0.0 3.7.2 2.3.0 - 4.4.4 - 4.4.4 + 4.4.5 + 4.4.5 0.15.0 - 2.0.6 - 2.32.0 + 2.0.7 + 2.34.0 2.38.0 4.25 @@ -308,7 +308,7 @@ Import-Package: \\ org.apache.maven.plugins maven-enforcer-plugin - 3.4.0 + 3.4.1 diff --git a/tools/archetype/binding/pom.xml b/tools/archetype/binding/pom.xml index 4028adb4ead..0d28a7fcc6c 100644 --- a/tools/archetype/binding/pom.xml +++ b/tools/archetype/binding/pom.xml @@ -42,7 +42,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.3.1 @