OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Xtext/Xtend to 2.23.0 and LSP 0.9.0 (#1685) 

Upgrades to:

* Xtext 2.23.0
* Xtend 2.23.0
* LSP 0.9.0

For Xtext release notes see: https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2020/09/01/version-2-23-0

The Xtext dependencies are now managed using their BOM which makes it easier to keep them in sync.

Because Xtext depends on a newer ASM version some runtime dependencies were also upgraded:

* ASM 8.0.1
* Pax Web 7.2.15
* XBean 4.17.0

Signed-off-by: Wouter Born <github@maindrain.net>
pull/1688/head
Wouter Born 2020-10-04 12:27:58 +02:00 committed by GitHub
parent 11935a8ad8
commit abd2630777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 226 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bom/compile-model/pom.xml
View File

@ -15,13 +15,17 @@
<name>openHAB Core :: BOM :: Compile Model</name>
<properties>
<classgraph.version>4.8.35.v20190528-1517</classgraph.version>
<emf.1.version>2.12.0</emf.1.version>
<emf.3.version>2.11.0</emf.3.version>
<emf.mwe.version>1.5.0</emf.mwe.version>
<emf.mwe2.version>2.11.0</emf.mwe2.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-dev-bom</artifactId>
<version>${xtext.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
@ -41,37 +45,37 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
<version>${emf.1.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
<version>${emf.1.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.change</artifactId>
<version>${emf.3.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<version>${emf.1.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>${emf.3.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen.ecore</artifactId>
<version>${emf.1.version}</version>
<scope>compile</scope>
</dependency>
@ -79,7 +83,6 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>${emf.mwe2.version}</version>
</dependency>
<dependency>
@ -99,14 +102,6 @@
</exclusions>
</dependency>
<!-- Xtext is using a classgraph artifact from Eclipse Orbit -->
<!-- Karaf feature validation fails when using classgraph from Maven Central -->
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>${classgraph.version}</version>
</dependency>
<!--Xbase -->
<dependency>
<groupId>org.eclipse.xtext</groupId>

69
bom/runtime/pom.xml
View File

@ -18,10 +18,28 @@
<properties>
<jackson.version>2.10.3</jackson.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<pax.web.version>7.2.11</pax.web.version>
<pax.web.version>7.2.19</pax.web.version>
<swagger.version>2.1.0</swagger.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-dev-bom</artifactId>
<version>${xtext.version}</version>
<type>pom</type>
<scope>import</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- BEG: Slightly modified EnRoute implementation index artifacts -->
@ -728,13 +746,13 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.12</version>
<version>4.17</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>4.12</version>
<version>4.17</version>
<scope>compile</scope>
</dependency>
@ -757,53 +775,50 @@
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.35.v20190528-1517</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
<version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
<version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.change</artifactId>
<version>2.11.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.common.types</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -815,7 +830,7 @@
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.ide</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -827,25 +842,35 @@
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.util</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.ide</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
<version>2.19.0</version>
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@ -884,18 +909,6 @@
<version>2.4.0-b34</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.1</version>
<scope>compile</scope>
</dependency>
<!-- jollyday -->
<dependency>

2
bundles/org.openhab.core.model.item/bnd.bnd
View File

@ -44,4 +44,4 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0"
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0"

2
bundles/org.openhab.core.model.item/plugin.xml_gen
View File

@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
<package
uri = "https://openhab.org/model/Items"
class = "org.openhab.core.model.items.ItemsPackage"
genModel = "model/generated/Items.genmodel" />

21
bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
View File

@ -15,7 +15,6 @@ package org.openhab.core.model.lsp.internal;
import java.io.File;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -55,26 +54,6 @@ public class MappingUriExtensions extends UriExtensions {
return removeTrailingSlash(configPathURI.toString());
}
@Override
public String toPath(URI uri) {
return toPath(java.net.URI.create(uri.toString()));
}
@Override
public String toPath(java.net.URI uri) {
java.net.URI ret = uri;
try {
ret = Paths.get(uri).toUri();
} catch (FileSystemNotFoundException e) {
// fall-back to the argument
}
String clientPath = removeTrailingSlash(ret.toASCIIString());
if (clientLocation != null) {
clientPath = clientPath.replace(serverLocation, clientLocation);
}
return clientPath;
}
@Override
public URI toUri(String pathWithScheme) {
String decodedPathWithScheme = URLDecoder.decode(pathWithScheme, StandardCharsets.UTF_8);

6
bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
View File

@ -18,10 +18,10 @@ import org.eclipse.lsp4j.services.LanguageServer;
import org.eclipse.xtext.ide.ExecutorServiceProvider;
import org.eclipse.xtext.ide.server.DefaultProjectDescriptionFactory;
import org.eclipse.xtext.ide.server.ILanguageServerShutdownAndExitHandler;
import org.eclipse.xtext.ide.server.IMultiRootWorkspaceConfigFactory;
import org.eclipse.xtext.ide.server.IProjectDescriptionFactory;
import org.eclipse.xtext.ide.server.IWorkspaceConfigFactory;
import org.eclipse.xtext.ide.server.LanguageServerImpl;
import org.eclipse.xtext.ide.server.ProjectWorkspaceConfigFactory;
import org.eclipse.xtext.ide.server.MultiRootWorkspaceConfigFactory;
import org.eclipse.xtext.ide.server.UriExtensions;
import org.eclipse.xtext.resource.IContainer;
import org.eclipse.xtext.resource.IResourceServiceProvider;
@ -54,7 +54,7 @@ public class RuntimeServerModule extends AbstractModule {
bind(UriExtensions.class).toInstance(new MappingUriExtensions(OpenHAB.getConfigFolder()));
bind(LanguageServer.class).to(LanguageServerImpl.class);
bind(IResourceServiceProvider.Registry.class).toProvider(new RegistryProvider(scriptServiceUtil, scriptEngine));
bind(IWorkspaceConfigFactory.class).to(ProjectWorkspaceConfigFactory.class);
bind(IMultiRootWorkspaceConfigFactory.class).to(MultiRootWorkspaceConfigFactory.class);
bind(IProjectDescriptionFactory.class).to(DefaultProjectDescriptionFactory.class);
bind(IContainer.Manager.class).to(ProjectDescriptionBasedContainerManager.class);
bind(ILanguageServerShutdownAndExitHandler.class).to(ILanguageServerShutdownAndExitHandler.NullImpl.class);

11
bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
View File

@ -99,17 +99,6 @@ public class MappingUriExtensionsTest {
assertEquals(confFolder.toPath().toUri().toString() + expectedUriPath, clientPath.toString());
}
@ParameterizedTest
@MethodSource("data")
public void testToPathEmfURI(String conf, String request, String expectedClientPath, String expectedUriPath) {
MappingUriExtensions mapper = createMapper(conf);
mapper.toUri(request);
URI uri = URI.createURI(confFolder.toPath().toUri().toString() + expectedUriPath);
String res = mapper.toPath(uri);
assertEquals(request, res);
}
private MappingUriExtensions createMapper(String conf) {
return new MappingUriExtensions(conf) {
@Override

6
bundles/org.openhab.core.model.persistence/bnd.bnd
View File

@ -41,6 +41,6 @@ Require-Bundle: org.antlr.runtime,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0",\
org.eclipse.xtext.xbase;bundle-version="2.19.0";resolution:=optional;visibility:=reexport,\
org.eclipse.xtext;bundle-version="2.19.0";visibility:=reexport
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
org.eclipse.xtext.xbase;bundle-version="2.23.0";resolution:=optional;visibility:=reexport,\
org.eclipse.xtext;bundle-version="2.23.0";visibility:=reexport

4
bundles/org.openhab.core.model.rule/bnd.bnd
View File

@ -49,6 +49,6 @@ Require-Bundle: org.antlr.runtime,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0",\
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
org.eclipse.xtext;visibility:=reexport,\
org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional
org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional

2
bundles/org.openhab.core.model.script/bnd.bnd
View File

@ -60,7 +60,7 @@ Require-Bundle: org.antlr.runtime,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0",\
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
org.eclipse.xtext.xbase;visibility:=reexport,\
org.eclipse.xtext;visibility:=reexport,\
org.objectweb.asm;resolution:=optional

2
bundles/org.openhab.core.model.sitemap/bnd.bnd
View File

@ -28,4 +28,4 @@ Require-Bundle: org.antlr.runtime,\
org.eclipse.xtext,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0"
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0"

4
bundles/org.openhab.core.model.thing/bnd.bnd
View File

@ -45,7 +45,7 @@ Require-Bundle: org.antlr.runtime,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator;resolution:=optional,\
org.eclipse.xtext.util,\
org.eclipse.xtext.xbase.lib;bundle-version="2.19.0",\
org.eclipse.xtext.xbase.lib;bundle-version="2.23.0",\
org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,\
org.eclipse.xtext;visibility:=reexport,\
org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional
org.objectweb.asm;bundle-version="[8.0.0,9.0.0)";resolution:=optional

2
bundles/org.openhab.core.model.thing/plugin.xml_gen
View File

@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
<package
uri = "https://openhab.org/model/Thing"
class = "org.openhab.core.model.thing.thing.ThingPackage"
genModel = "model/generated/Thing.genmodel" />

6
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -28,7 +28,7 @@
<feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.23.0)(!(version&gt;=2.24.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@ -385,10 +385,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.23.0)(!(version&gt;=2.24.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.8.0)(!(version&gt;=0.9.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.9.0)(!(version&gt;=0.9.9)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>

40
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -171,9 +171,9 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.8.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.8.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.8.0</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.9.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.9.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.9.0</bundle>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@ -193,26 +193,26 @@
</feature>
<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.19.0</capability>
<capability>openhab.tp;feature=xtext;version=2.23.0</capability>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.19.0</bundle>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.35.v20190528-1517</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.12.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.12.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.11.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.12.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.23.0</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.23.0</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/27.1-jre</bundle>
@ -232,16 +232,16 @@
<!-- Add ASM package -->
<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.1</bundle>
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/8.0.1</bundle>
</feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.19.0</capability>
<capability>openhab.tp;feature=xtext-ide;version=2.23.0</capability>
<feature dependency="true">openhab.tp-xtext</feature>
<!-- Support for the Language Server Protocol -->
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.23.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.23.0</bundle>
</feature>
<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">

19
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -35,17 +35,8 @@ Fragment-Host: org.openhab.core.io.rest.core
org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)',\
@ -77,4 +68,12 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
javax.xml.soap-api;version='[1.4.0,1.4.1)',\
org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)'
org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

43
itests/org.openhab.core.model.core.tests/itest.bndrun
View File

@ -15,9 +15,6 @@ Fragment-Host: org.openhab.core.model.core
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
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.osgi.service.event;version='[1.4.0,1.4.1)',\
@ -33,20 +30,7 @@ Fragment-Host: org.openhab.core.model.core
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@ -59,10 +43,6 @@ Fragment-Host: org.openhab.core.model.core
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -102,4 +82,25 @@ Fragment-Host: org.openhab.core.model.core
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
jollyday;version='[0.5.10,0.5.11)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core.model.sitemap.runtime;version='[3.0.0,3.0.1)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

43
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -16,9 +16,6 @@ Fragment-Host: org.openhab.core.model.item
log4j;version='[1.2.17,1.2.18)',\
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
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.osgi.service.event;version='[1.4.0,1.4.1)',\
@ -35,19 +32,6 @@ Fragment-Host: org.openhab.core.model.item
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@ -60,10 +44,6 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -101,4 +81,25 @@ Fragment-Host: org.openhab.core.model.item
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
jollyday;version='[0.5.10,0.5.11)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core.model.sitemap.runtime;version='[3.0.0,3.0.1)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

54
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -16,9 +16,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
log4j;version='[1.2.17,1.2.18)',\
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
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.osgi.service.event;version='[1.4.0,1.4.1)',\
@ -34,36 +31,12 @@ Fragment-Host: org.openhab.core.model.rule.runtime
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@ -76,10 +49,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -117,5 +86,26 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
jollyday;version='[0.5.10,0.5.11)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core.model.sitemap.runtime;version='[3.0.0,3.0.1)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'
-runblacklist: bnd.identity;id='jakarta.activation-api'

43
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -17,9 +17,6 @@ Fragment-Host: org.openhab.core.model.script
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
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.osgi.service.event;version='[1.4.0,1.4.1)',\
@ -27,8 +24,6 @@ Fragment-Host: org.openhab.core.model.script
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
@ -37,17 +32,6 @@ Fragment-Host: org.openhab.core.model.script
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@ -60,10 +44,6 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -100,5 +80,26 @@ Fragment-Host: org.openhab.core.model.script
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
jollyday;version='[0.5.10,0.5.11)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core.model.sitemap.runtime;version='[3.0.0,3.0.1)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

43
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -20,9 +20,6 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
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)',\
@ -32,8 +29,6 @@ Fragment-Host: org.openhab.core.model.thing
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
com.google.gson;version='[2.8.2,2.8.3)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
@ -41,17 +36,6 @@ Fragment-Host: org.openhab.core.model.thing
com.google.guava;version='[27.1.0,27.1.1)',\
com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@ -64,10 +48,6 @@ Fragment-Host: org.openhab.core.model.thing
org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -113,5 +93,26 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
jollyday;version='[0.5.10,0.5.11)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
org.eclipse.xtend.lib;version='[2.23.0,2.23.1)',\
org.eclipse.xtend.lib.macro;version='[2.23.0,2.23.1)',\
org.eclipse.xtext;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.common.types;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.util;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase;version='[2.23.0,2.23.1)',\
org.eclipse.xtext.xbase.lib;version='[2.23.0,2.23.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.openhab.core.model.sitemap.runtime;version='[3.0.0,3.0.1)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

20
itests/org.openhab.core.voice.tests/itest.bndrun
View File

@ -18,15 +18,10 @@ Fragment-Host: org.openhab.core.voice
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
slf4j.api;version='[1.7.25,1.7.26)',\
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
com.google.gson;version='[2.8.2,2.8.3)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@ -35,10 +30,6 @@ Fragment-Host: org.openhab.core.voice
org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.11,7.2.12)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
org.openhab.core;version='[3.0.0,3.0.1)',\
org.openhab.core.audio;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
@ -60,4 +51,13 @@ Fragment-Host: org.openhab.core.voice
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
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)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)'
org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
org.apache.xbean.bundleutils;version='[4.17.0,4.17.1)',\
org.apache.xbean.finder;version='[4.17.0,4.17.1)',\
org.objectweb.asm;version='[8.0.1,8.0.2)',\
org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)'

2
pom.xml
View File

@ -74,7 +74,7 @@
<karaf.tooling.version>4.2.7</karaf.tooling.version>
<sat.version>0.10.0</sat.version>
<slf4j.version>1.7.21</slf4j.version>
<xtext.version>2.19.0</xtext.version>
<xtext.version>2.23.0</xtext.version>
<spotless.version>2.0.3</spotless.version>
</properties>