Upgrade to Xtext 2.19, LSP4J 0.8.0 and fix LSP server (#1171)

Every connection to the LSP server failed because it always threw a org.eclipse.smarthome.model.ide.SitemapIdeSetup NoClassDefFoundError.
Which is caused by the SitemapIdeSetup residing in a package that is split between both the org.openhab.core.model.item.ide and the org.openhab.core.model.sitemap.ide bundles.
The SitemapIdeSetup class is also using classes from the org.eclipse.smarthome.model package which is also a package split between the org.openhab.core.model.items and org.openhab.core.model.sitemap bundles.
After renaming the packages used for the sitemap classes the NoClassDefFoundError is resolved and LSP works properly again.
Many imports were updated for the sitemap model package changes.

Fixes #1030

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2019-11-07 16:26:59 +01:00 committed by Kai Kreuzer
parent ce404e0a84
commit e943ec8970
49 changed files with 297 additions and 250 deletions

View File

@ -15,10 +15,11 @@
<name>openHAB Core :: BOM :: Compile Model</name> <name>openHAB Core :: BOM :: Compile Model</name>
<properties> <properties>
<classgraph.version>4.8.35.v20190528-1517</classgraph.version>
<emf.1.version>2.12.0</emf.1.version> <emf.1.version>2.12.0</emf.1.version>
<emf.3.version>2.11.0</emf.3.version> <emf.3.version>2.11.0</emf.3.version>
<emf.mwe.version>1.4.0</emf.mwe.version> <emf.mwe.version>1.5.0</emf.mwe.version>
<emf.mwe2.version>2.10.0</emf.mwe2.version> <emf.mwe2.version>2.11.0</emf.mwe2.version>
</properties> </properties>
<dependencies> <dependencies>
@ -86,6 +87,10 @@
<version>${xtext.version}</version> <version>${xtext.version}</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.eclipse.platform</groupId> <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId> <artifactId>org.eclipse.osgi</artifactId>
@ -93,6 +98,14 @@
</exclusions> </exclusions>
</dependency> </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 --> <!--Xbase -->
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>

View File

@ -718,7 +718,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>21.0</version> <version>27.1-jre</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -729,6 +729,11 @@
<version>3.2.0.v201101311130</version> <version>3.2.0.v201101311130</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.35.v20190528-1517</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.emf</groupId> <groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId> <artifactId>org.eclipse.emf.common</artifactId>
@ -756,31 +761,37 @@
<dependency> <dependency>
<groupId>org.eclipse.xtend</groupId> <groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId> <artifactId>org.eclipse.xtend.lib</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtend</groupId> <groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId> <artifactId>org.eclipse.xtend.lib.macro</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext</artifactId> <artifactId>org.eclipse.xtext</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.common.types</artifactId> <artifactId>org.eclipse.xtext.common.types</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.ide</artifactId> <artifactId>org.eclipse.xtext.ide</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -792,25 +803,25 @@
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.util</artifactId> <artifactId>org.eclipse.xtext.util</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId> <artifactId>org.eclipse.xtext.xbase</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.ide</artifactId> <artifactId>org.eclipse.xtext.xbase.ide</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.xtext</groupId> <groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId> <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
<version>2.17.0</version> <version>2.19.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -858,7 +869,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>7.0</version> <version>7.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

View File

@ -20,13 +20,13 @@ import org.eclipse.smarthome.core.thing.Thing;
import org.eclipse.smarthome.core.thing.ThingRegistry; import org.eclipse.smarthome.core.thing.ThingRegistry;
import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry; import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
import org.eclipse.smarthome.model.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapFactory;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.eclipse.smarthome.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.impl.DefaultImpl; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.impl.FrameImpl; import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
import org.eclipse.smarthome.model.sitemap.impl.SitemapImpl; import org.eclipse.smarthome.model.sitemap.sitemap.impl.DefaultImpl;
import org.eclipse.smarthome.model.sitemap.impl.TextImpl; import org.eclipse.smarthome.model.sitemap.sitemap.impl.FrameImpl;
import org.eclipse.smarthome.model.sitemap.sitemap.impl.SitemapImpl;
import org.eclipse.smarthome.model.sitemap.sitemap.impl.TextImpl;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;

View File

@ -36,10 +36,10 @@ import org.eclipse.smarthome.io.rest.sitemap.internal.PageChangeListener;
import org.eclipse.smarthome.io.rest.sitemap.internal.SitemapEvent; import org.eclipse.smarthome.io.rest.sitemap.internal.SitemapEvent;
import org.eclipse.smarthome.model.core.EventType; import org.eclipse.smarthome.model.core.EventType;
import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
import org.eclipse.smarthome.model.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.eclipse.smarthome.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

View File

@ -32,11 +32,11 @@ import org.eclipse.smarthome.core.library.CoreItemFactory;
import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
import org.eclipse.smarthome.model.sitemap.Chart; import org.eclipse.smarthome.model.sitemap.sitemap.Chart;
import org.eclipse.smarthome.model.sitemap.ColorArray; import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Frame; import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
import org.eclipse.smarthome.model.sitemap.VisibilityRule; import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
/** /**

View File

@ -62,24 +62,24 @@ import org.eclipse.smarthome.io.rest.RESTResource;
import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService;
import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
import org.eclipse.smarthome.model.sitemap.Chart;
import org.eclipse.smarthome.model.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Frame;
import org.eclipse.smarthome.model.sitemap.Image;
import org.eclipse.smarthome.model.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.List;
import org.eclipse.smarthome.model.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.Mapview;
import org.eclipse.smarthome.model.sitemap.Selection;
import org.eclipse.smarthome.model.sitemap.Setpoint;
import org.eclipse.smarthome.model.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.eclipse.smarthome.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.Slider; import org.eclipse.smarthome.model.sitemap.sitemap.Chart;
import org.eclipse.smarthome.model.sitemap.Switch; import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Video; import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
import org.eclipse.smarthome.model.sitemap.VisibilityRule; import org.eclipse.smarthome.model.sitemap.sitemap.Image;
import org.eclipse.smarthome.model.sitemap.Webview; import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.List;
import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.sitemap.Mapview;
import org.eclipse.smarthome.model.sitemap.sitemap.Selection;
import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
import org.eclipse.smarthome.model.sitemap.sitemap.Video;
import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
import org.eclipse.smarthome.model.sitemap.sitemap.Webview;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.EventOutput;
import org.glassfish.jersey.media.sse.OutboundEvent; import org.glassfish.jersey.media.sse.OutboundEvent;

View File

@ -42,11 +42,11 @@ import org.eclipse.smarthome.core.library.types.PercentType;
import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.Command;
import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.io.rest.LocaleService; import org.eclipse.smarthome.io.rest.LocaleService;
import org.eclipse.smarthome.model.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.eclipse.smarthome.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.VisibilityRule; import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.test.java.JavaTest; import org.eclipse.smarthome.test.java.JavaTest;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.junit.Before; import org.junit.Before;

View File

@ -17,12 +17,12 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.smarthome.model.ide.ItemsIdeSetup; import org.eclipse.smarthome.model.ide.ItemsIdeSetup;
import org.eclipse.smarthome.model.ide.SitemapIdeSetup;
import org.eclipse.smarthome.model.persistence.ide.PersistenceIdeSetup; import org.eclipse.smarthome.model.persistence.ide.PersistenceIdeSetup;
import org.eclipse.smarthome.model.rule.ide.RulesIdeSetup; import org.eclipse.smarthome.model.rule.ide.RulesIdeSetup;
import org.eclipse.smarthome.model.script.ScriptServiceUtil; import org.eclipse.smarthome.model.script.ScriptServiceUtil;
import org.eclipse.smarthome.model.script.engine.ScriptEngine; import org.eclipse.smarthome.model.script.engine.ScriptEngine;
import org.eclipse.smarthome.model.script.ide.ScriptIdeSetup; import org.eclipse.smarthome.model.script.ide.ScriptIdeSetup;
import org.eclipse.smarthome.model.sitemap.ide.SitemapIdeSetup;
import org.eclipse.smarthome.model.thing.ide.ThingIdeSetup; import org.eclipse.smarthome.model.thing.ide.ThingIdeSetup;
import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.XtextPackage;
import org.eclipse.xtext.resource.FileExtensionProvider; import org.eclipse.xtext.resource.FileExtensionProvider;

View File

@ -11,9 +11,9 @@
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.19.0
*/ */
package org.eclipse.smarthome.model.ide package org.eclipse.smarthome.model.sitemap.ide
/** /**

View File

@ -11,13 +11,13 @@
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.19.0
*/ */
package org.eclipse.smarthome.model.ide package org.eclipse.smarthome.model.sitemap.ide
import com.google.inject.Guice import com.google.inject.Guice
import org.eclipse.smarthome.model.SitemapRuntimeModule import org.eclipse.smarthome.model.sitemap.SitemapRuntimeModule
import org.eclipse.smarthome.model.SitemapStandaloneSetup import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup
import org.eclipse.xtext.util.Modules2 import org.eclipse.xtext.util.Modules2
/** /**

View File

@ -12,8 +12,8 @@
*/ */
package org.eclipse.smarthome.model.sitemap.runtime.internal; package org.eclipse.smarthome.model.sitemap.runtime.internal;
import org.eclipse.smarthome.model.SitemapStandaloneSetup;
import org.eclipse.smarthome.model.core.ModelParser; import org.eclipse.smarthome.model.core.ModelParser;
import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,16 +1,16 @@
Bundle-SymbolicName: ${project.artifactId} Bundle-SymbolicName: ${project.artifactId}
Export-Package: org.eclipse.smarthome.model,\ Export-Package: org.eclipse.smarthome.model.sitemap,\
org.eclipse.smarthome.model.formatting,\ org.eclipse.smarthome.model.sitemap.formatting,\
org.eclipse.smarthome.model.generator,\ org.eclipse.smarthome.model.sitemap.generator,\
org.eclipse.smarthome.model.parser.antlr,\ org.eclipse.smarthome.model.sitemap.parser.antlr,\
org.eclipse.smarthome.model.parser.antlr.internal,\ org.eclipse.smarthome.model.sitemap.parser.antlr.internal,\
org.eclipse.smarthome.model.scoping,\ org.eclipse.smarthome.model.sitemap.scoping,\
org.eclipse.smarthome.model.serializer,\ org.eclipse.smarthome.model.sitemap.serializer,\
org.eclipse.smarthome.model.services,\ org.eclipse.smarthome.model.sitemap.services,\
org.eclipse.smarthome.model.sitemap,\ org.eclipse.smarthome.model.sitemap.sitemap,\
org.eclipse.smarthome.model.sitemap.impl,\ org.eclipse.smarthome.model.sitemap.sitemap.impl,\
org.eclipse.smarthome.model.sitemap.util,\ org.eclipse.smarthome.model.sitemap.sitemap.util,\
org.eclipse.smarthome.model.validation org.eclipse.smarthome.model.sitemap.validation
Import-Package: org.apache.commons.lang,\ Import-Package: org.apache.commons.lang,\
org.apache.log4j,\ org.apache.log4j,\
org.eclipse.jdt.annotation;resolution:=optional,\ org.eclipse.jdt.annotation;resolution:=optional,\

View File

@ -5,8 +5,8 @@
<extension point="org.eclipse.emf.ecore.generated_package"> <extension point="org.eclipse.emf.ecore.generated_package">
<package <package
uri = "http://www.eclipse.org/smarthome/model/Sitemap" uri = "http://www.eclipse.org/smarthome/model/sitemap/Sitemap"
class = "org.eclipse.smarthome.model.sitemap.SitemapPackage" class = "org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage"
genModel = "model/generated/Sitemap.genmodel" /> genModel = "model/generated/Sitemap.genmodel" />
</extension> </extension>

View File

@ -52,7 +52,7 @@
<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass> <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads> <cleanupDaemonThreads>false</cleanupDaemonThreads>
<arguments> <arguments>
<argument>file://${project.basedir}/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2</argument> <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2</argument>
<argument>-p</argument> <argument>-p</argument>
<argument>rootPath=/${project.basedir}/..</argument> <argument>rootPath=/${project.basedir}/..</argument>
</arguments> </arguments>

View File

@ -10,14 +10,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
module org.eclipse.smarthome.model.GenerateSitemap module org.eclipse.smarthome.model.sitemap.GenerateSitemap
import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.*
import org.eclipse.xtext.xtext.generator.model.project.* import org.eclipse.xtext.xtext.generator.model.project.*
var rootPath = ".." var rootPath = ".."
var projectName = "org.openhab.core.model.sitemap" var projectName = "org.openhab.core.model.sitemap"
var languageName = "org.eclipse.smarthome.model.Sitemap" var languageName = "org.eclipse.smarthome.model.sitemap.Sitemap"
var fileExtensions = "sitemap" var fileExtensions = "sitemap"
var generateXtendStub = true var generateXtendStub = true
var encoding = "UTF-8" var encoding = "UTF-8"

View File

@ -1,3 +1,3 @@
grammarURI=classpath:/org/openhab/model/Sitemap.xtext grammarURI=classpath:/org/openhab/model/sitemap/Sitemap.xtext
file.extensions=sitemap file.extensions=sitemap
projectName=org.eclipse.smarthome.model.sitemap projectName=org.eclipse.smarthome.model.sitemap

View File

@ -1,4 +1,4 @@
grammar org.eclipse.smarthome.model.Sitemap with org.eclipse.xtext.common.Terminals grammar org.eclipse.smarthome.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals
import "http://www.eclipse.org/emf/2002/Ecore" as ecore import "http://www.eclipse.org/emf/2002/Ecore" as ecore
generate sitemap "http://www.eclipse.org/smarthome/model/Sitemap" generate sitemap "http://www.eclipse.org/smarthome/model/Sitemap"

View File

@ -14,9 +14,11 @@ package org.eclipse.smarthome.model.sitemap;
import java.util.Set; import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
@NonNullByDefault @NonNullByDefault
public interface SitemapProvider { public interface SitemapProvider {

View File

@ -14,9 +14,9 @@ package
/* /*
* generated by Xtext * generated by Xtext
*/ */
org.eclipse.smarthome.model org.eclipse.smarthome.model.sitemap
import org.eclipse.smarthome.model.valueconverter.SitemapConverters import org.eclipse.smarthome.model.sitemap.valueconverter.SitemapConverters
import org.eclipse.xtext.conversion.IValueConverterService import org.eclipse.xtext.conversion.IValueConverterService
import org.eclipse.xtext.linking.lazy.LazyURIEncoder import org.eclipse.xtext.linking.lazy.LazyURIEncoder
import com.google.inject.Binder import com.google.inject.Binder
@ -25,7 +25,7 @@ import com.google.inject.name.Names
/** /**
* Use this class to register components to be used at runtime / without the Equinox extension registry. * Use this class to register components to be used at runtime / without the Equinox extension registry.
*/ */
class SitemapRuntimeModule extends org.eclipse.smarthome.model.AbstractSitemapRuntimeModule { class SitemapRuntimeModule extends org.eclipse.smarthome.model.sitemap.AbstractSitemapRuntimeModule {
override Class<? extends IValueConverterService> bindIValueConverterService() { override Class<? extends IValueConverterService> bindIValueConverterService() {
return SitemapConverters return SitemapConverters
} }

View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.smarthome.model package org.eclipse.smarthome.model.sitemap
import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EPackage
import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.Resource

View File

@ -13,7 +13,7 @@
/* /*
* generated by Xtext * generated by Xtext
*/ */
package org.eclipse.smarthome.model.formatting package org.eclipse.smarthome.model.sitemap.formatting
import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
import org.eclipse.xtext.formatting.impl.FormattingConfig import org.eclipse.xtext.formatting.impl.FormattingConfig

View File

@ -13,7 +13,7 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.12.0
*/ */
package org.eclipse.smarthome.model.generator package org.eclipse.smarthome.model.sitemap.generator
import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.xtext.generator.AbstractGenerator import org.eclipse.xtext.generator.AbstractGenerator

View File

@ -25,7 +25,7 @@ import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.model.core.EventType; import org.eclipse.smarthome.model.core.EventType;
import org.eclipse.smarthome.model.core.ModelRepository; import org.eclipse.smarthome.model.core.ModelRepository;
import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.eclipse.smarthome.model.sitemap.SitemapProvider;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

View File

@ -13,7 +13,7 @@
/* /*
* generated by Xtext * generated by Xtext
*/ */
package org.eclipse.smarthome.model.scoping package org.eclipse.smarthome.model.sitemap.scoping
/** /**
* This class contains custom scoping description. * This class contains custom scoping description.

View File

@ -13,7 +13,7 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.12.0
*/ */
package org.eclipse.smarthome.model.serializer package org.eclipse.smarthome.model.sitemap.serializer
class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer { class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer {

View File

@ -13,7 +13,7 @@
/* /*
* generated by Xtext 2.12.0 * generated by Xtext 2.12.0
*/ */
package org.eclipse.smarthome.model.serializer package org.eclipse.smarthome.model.sitemap.serializer
class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer { class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer {

View File

@ -13,15 +13,15 @@
/* /*
* generated by Xtext * generated by Xtext
*/ */
package org.eclipse.smarthome.model.validation package org.eclipse.smarthome.model.sitemap.validation
import org.eclipse.smarthome.model.sitemap.Frame import org.eclipse.smarthome.model.sitemap.sitemap.Frame
import org.eclipse.smarthome.model.sitemap.LinkableWidget import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget
import org.eclipse.smarthome.model.sitemap.Sitemap import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint
import org.eclipse.smarthome.model.sitemap.SitemapPackage import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap
import org.eclipse.smarthome.model.sitemap.Widget import org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage
import org.eclipse.smarthome.model.sitemap.sitemap.Widget
import org.eclipse.xtext.validation.Check import org.eclipse.xtext.validation.Check
import org.eclipse.smarthome.model.sitemap.Setpoint
import java.math.BigDecimal import java.math.BigDecimal
//import org.eclipse.xtext.validation.Check //import org.eclipse.xtext.validation.Check

View File

@ -10,7 +10,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.smarthome.model.valueconverter; package org.eclipse.smarthome.model.sitemap.valueconverter;
import java.util.regex.Pattern; import java.util.regex.Pattern;

View File

@ -74,17 +74,17 @@ import org.eclipse.smarthome.core.types.StateOption;
import org.eclipse.smarthome.core.types.Type; import org.eclipse.smarthome.core.types.Type;
import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.core.types.UnDefType;
import org.eclipse.smarthome.core.types.util.UnitUtils; import org.eclipse.smarthome.core.types.util.UnitUtils;
import org.eclipse.smarthome.model.sitemap.ColorArray; import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Default; import org.eclipse.smarthome.model.sitemap.sitemap.Default;
import org.eclipse.smarthome.model.sitemap.Group; import org.eclipse.smarthome.model.sitemap.sitemap.Group;
import org.eclipse.smarthome.model.sitemap.LinkableWidget; import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.Mapping; import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapFactory; import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
import org.eclipse.smarthome.model.sitemap.Slider; import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
import org.eclipse.smarthome.model.sitemap.Switch; import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
import org.eclipse.smarthome.model.sitemap.VisibilityRule; import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.internal.UIActivator; import org.eclipse.smarthome.ui.internal.UIActivator;
import org.eclipse.smarthome.ui.items.ItemUIProvider; import org.eclipse.smarthome.ui.items.ItemUIProvider;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;

View File

@ -34,10 +34,10 @@ import org.eclipse.jetty.util.StringUtil;
import org.eclipse.smarthome.core.library.types.StringType; import org.eclipse.smarthome.core.library.types.StringType;
import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.model.core.ModelRepository; import org.eclipse.smarthome.model.core.ModelRepository;
import org.eclipse.smarthome.model.sitemap.Image; import org.eclipse.smarthome.model.sitemap.sitemap.Image;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.Video; import org.eclipse.smarthome.model.sitemap.sitemap.Video;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

View File

@ -15,7 +15,7 @@ package org.eclipse.smarthome.ui.items;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.items.Item; import org.eclipse.smarthome.core.items.Item;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
/** /**
* This interface describes the methods that need to be implemented by a provider that * This interface describes the methods that need to be implemented by a provider that

View File

@ -22,9 +22,9 @@ import org.eclipse.smarthome.core.items.Item;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.eclipse.smarthome.core.items.ItemRegistry;
import org.eclipse.smarthome.core.library.types.QuantityType; import org.eclipse.smarthome.core.library.types.QuantityType;
import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.model.sitemap.LinkableWidget; import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
/** /**
* This interface is used by a service which combines the core item registry * This interface is used by a service which combines the core item registry

View File

@ -40,13 +40,13 @@ import org.eclipse.smarthome.core.types.StateDescription;
import org.eclipse.smarthome.core.types.StateOption; import org.eclipse.smarthome.core.types.StateOption;
import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.core.types.UnDefType;
import org.eclipse.smarthome.core.types.util.UnitUtils; import org.eclipse.smarthome.core.types.util.UnitUtils;
import org.eclipse.smarthome.model.sitemap.ColorArray; import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
import org.eclipse.smarthome.model.sitemap.Mapping; import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapFactory; import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
import org.eclipse.smarthome.model.sitemap.Slider; import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
import org.eclipse.smarthome.model.sitemap.Switch; import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
import org.eclipse.smarthome.model.sitemap.Widget; import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIProvider; import org.eclipse.smarthome.ui.items.ItemUIProvider;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

View File

@ -29,10 +29,10 @@ import org.eclipse.smarthome.core.library.types.OnOffType;
import org.eclipse.smarthome.core.library.types.StringType; import org.eclipse.smarthome.core.library.types.StringType;
import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.core.types.UnDefType;
import org.eclipse.smarthome.model.core.ModelRepository; import org.eclipse.smarthome.model.core.ModelRepository;
import org.eclipse.smarthome.model.sitemap.Image; import org.eclipse.smarthome.model.sitemap.sitemap.Image;
import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.Switch; import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
import org.eclipse.smarthome.model.sitemap.Video; import org.eclipse.smarthome.model.sitemap.sitemap.Video;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

View File

@ -25,7 +25,7 @@
<feature dependency="true">openhab.tp-gson</feature> <feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement> <requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature> <feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs)"</requirement> <requirement>openhab.tp;filter:="(feature=jax-rs)"</requirement>
@ -379,10 +379,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}"> <feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement> <requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature> <feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.6.0)(!(version&gt;=0.7.0)))"</requirement> <requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.8.0)(!(version&gt;=0.9.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature> <feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature> <feature>openhab-core-model-item-ide</feature>

View File

@ -188,9 +188,9 @@
</feature> </feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}"> <feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.6.0</capability> <capability>openhab.tp;feature=lsp4j;version=0.8.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.6.0</bundle> <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.8.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.6.0</bundle> <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.8.0</bundle>
<feature dependency="true">openhab.tp-gson</feature> <feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature> <feature dependency="true">openhab.tp-xtext</feature>
@ -221,51 +221,55 @@
</feature> </feature>
<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}"> <feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.17.0</capability> <capability>openhab.tp;feature=xtext;version=2.19.0</capability>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.17.0</bundle> <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.19.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.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/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.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.emf/org.eclipse.emf.ecore.xmi/2.12.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.17.0</bundle> <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.19.0</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</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.17.0</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.17.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.17.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.17.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.17.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.17.0</bundle> <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.19.0</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/21.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>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
<!--<bundle dependency="true">mvn:com.google.inject/guice/3.0</bundle>--> <!--<bundle dependency="true">mvn:com.google.inject/guice/3.0</bundle>-->
<!--<bundle dependency="true">wrap:mvn:org.antlr/antlr-runtime/3.2</bundle>--> <!--<bundle dependency="true">wrap:mvn:org.antlr/antlr-runtime/3.2</bundle>-->
<!--<bundle dependency="true">wrap:mvn:aopalliance/aopalliance/1.0</bundle>--> <!--<bundle dependency="true">wrap:mvn:aopalliance/aopalliance/1.0</bundle>-->
<bundle dependency="true">mvn:de.maggu2810.p2redist/com.google.inject/3.0.0.v201312141243</bundle> <bundle dependency="true">mvn:de.maggu2810.p2redist/com.google.inject/3.0.0.v201312141243</bundle>
<bundle dependency="true">mvn:de.maggu2810.p2redist/org.antlr.runtime/3.2.0.v201101311130</bundle> <bundle dependency="true">mvn:de.maggu2810.p2redist/org.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0</bundle> <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.10.400</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.6.100</bundle> <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.8.400</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle> <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
<!-- Add ASM package --> <!-- Add ASM package -->
<!-- org.eclipse.xtext.common.types is using Require-Bundle --> <!-- org.eclipse.xtext.common.types is using Require-Bundle -->
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.0</bundle> <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.1</bundle>
</feature> </feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}"> <feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.17.0</capability> <capability>openhab.tp;feature=xtext-ide;version=2.19.0</capability>
<feature dependency="true">openhab.tp-xtext</feature> <feature dependency="true">openhab.tp-xtext</feature>
<!-- Support for the Language Server Protocol --> <!-- Support for the Language Server Protocol -->
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.17.0</bundle> <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.17.0</bundle> <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.19.0</bundle>
</feature> </feature>
<!-- <!--

View File

@ -18,7 +18,6 @@ Fragment-Host: org.openhab.core.automation
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
javax.measure.unit-api;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\
jollyday;version='[0.5.9,0.5.10)',\
org.apache.commons.collections;version='[3.2.1,3.2.2)',\ org.apache.commons.collections;version='[3.2.1,3.2.2)',\
org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\
@ -39,14 +38,15 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.automation;version='[2.5.0,2.5.1)',\ org.openhab.core.automation;version='[2.5.0,2.5.1)',\
org.openhab.core.automation.tests;version='[2.5.0,2.5.1)',\ org.openhab.core.automation.tests;version='[2.5.0,2.5.1)',\
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.openhab.core.test;version='[2.5.0,2.5.1)',\
org.openhab.core.thing;version='[2.5.0,2.5.1)',\ org.openhab.core.thing;version='[2.5.0,2.5.1)',\
org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'

View File

@ -41,4 +41,5 @@ Fragment-Host: org.openhab.core.binding.xml
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

View File

@ -45,4 +45,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

View File

@ -39,4 +39,5 @@ Fragment-Host: org.openhab.core.config.dispatch
org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.openhab.core.test;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

View File

@ -38,37 +38,46 @@ Fragment-Host: org.openhab.core.model.core
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objenesis;version='[2.6.0,2.6.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\
org.openhab.core.model.core.tests;version='[2.5.0,2.5.1)',\ org.openhab.core.model.core.tests;version='[2.5.0,2.5.1)',\
org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.openhab.core.test;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
joda-time;version='[2.9.2,2.9.3)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
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)',\
joda-time;version='[2.9.2,2.9.3)',\
jollyday;version='[0.5.9,0.5.10)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\ org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\ org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\ org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
@ -79,10 +88,10 @@ Fragment-Host: org.openhab.core.model.core
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.thing;version='[2.5.0,2.5.1)',\ org.openhab.core.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\ org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\ org.openhab.core.voice;version='[2.5.0,2.5.1)',\
@ -92,10 +101,4 @@ Fragment-Host: org.openhab.core.model.core
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\ org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\
jollyday;version='[0.5.9,0.5.10)',\ org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
org.mockito.mockito-core;version='[3.1.0,3.1.1)'

View File

@ -40,19 +40,10 @@ Fragment-Host: org.openhab.core.model.item
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\ org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
@ -77,16 +68,12 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\ org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
@ -102,4 +89,19 @@ Fragment-Host: org.openhab.core.model.item
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\ org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' 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.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'

View File

@ -40,19 +40,10 @@ Fragment-Host: org.openhab.core.model.persistence
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\ org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\ org.apache.commons.exec;version='[1.1.0,1.1.1)',\
@ -72,9 +63,6 @@ Fragment-Host: org.openhab.core.model.persistence
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\ org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
@ -97,5 +85,17 @@ Fragment-Host: org.openhab.core.model.persistence
jollyday;version='[0.5.9,0.5.10)',\ jollyday;version='[0.5.9,0.5.10)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\ tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\ com.google.guava;version='[27.1.0,27.1.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.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)'

View File

@ -63,24 +63,12 @@ Fragment-Host: org.openhab.core.model.rule.runtime
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
@ -102,4 +90,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.threeten.extra;version='[1.5.0,1.5.1)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\ tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)' 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.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'

View File

@ -60,24 +60,12 @@ Fragment-Host: org.openhab.core.model.script
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
org.openhab.core.model.script.tests;version='[2.5.0,2.5.1)',\ org.openhab.core.model.script.tests;version='[2.5.0,2.5.1)',\
org.openhab.core.test;version='[2.5.0,2.5.1)',\ org.openhab.core.test;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\ slf4j.api;version='[1.7.25,1.7.26)',\
@ -87,7 +75,6 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\ org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\ org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
@ -97,4 +84,19 @@ Fragment-Host: org.openhab.core.model.script
org.threeten.extra;version='[1.5.0,1.5.1)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\ tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)' 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.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

View File

@ -81,20 +81,8 @@ Fragment-Host: org.openhab.core.model.thing
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;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)',\ slf4j.api;version='[1.7.25,1.7.26)',\
com.google.guava;version='[21.0.0,21.0.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
org.eclipse.xtext;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
com.google.gson;version='[2.8.2,2.8.3)',\ 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.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
@ -107,5 +95,21 @@ Fragment-Host: org.openhab.core.model.thing
tec.uom.se;version='[1.0.10,1.0.11)',\ tec.uom.se;version='[1.0.10,1.0.11)',\
net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\ net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\ net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
org.mockito.mockito-core;version='[3.1.0,3.1.1)' org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
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.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'

View File

@ -46,4 +46,5 @@ Fragment-Host: org.openhab.core.thing.xml
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' tec.uom.se;version='[1.0.10,1.0.11)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

View File

@ -46,13 +46,13 @@ Fragment-Host: org.openhab.core.voice
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ 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.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
com.google.gson;version='[2.8.2,2.8.3)',\ com.google.gson;version='[2.8.2,2.8.3)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\ tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)' 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)'

View File

@ -74,7 +74,7 @@
<karaf.tooling.version>4.2.6</karaf.tooling.version> <karaf.tooling.version>4.2.6</karaf.tooling.version>
<sat.version>0.8.0</sat.version> <sat.version>0.8.0</sat.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<xtext.version>2.17.0</xtext.version> <xtext.version>2.19.0</xtext.version>
<spotless.version>1.24.3</spotless.version> <spotless.version>1.24.3</spotless.version>
<spotless.check.skip>true</spotless.check.skip> <!-- Spotless disabled for now --> <spotless.check.skip>true</spotless.check.skip> <!-- Spotless disabled for now -->
</properties> </properties>