diff --git a/bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF
index 0e0c2c9bb8e..d710c5d02df 100644
--- a/bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF
@@ -1,59 +1,56 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Item Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.item;singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model,
- org.eclipse.smarthome.model.formatting,
- org.eclipse.smarthome.model.generator,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.items,
- org.eclipse.smarthome.model.items.impl,
- org.eclipse.smarthome.model.items.util,
- org.eclipse.smarthome.model.parser.antlr,
- org.eclipse.smarthome.model.parser.antlr.internal,
- org.eclipse.smarthome.model.scoping,
- org.eclipse.smarthome.model.serializer,
- org.eclipse.smarthome.model.services,
- org.eclipse.smarthome.model.validation
-Import-Package: 
- javax.measure,
- javax.measure.quantity,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.config.core,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.i18n,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.items.dto,
- org.eclipse.smarthome.core.library.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.thing.util,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.core.types.util,
- org.eclipse.smarthome.model.core,
- org.eclipse.smarthome.model.core.valueconverter,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.slf4j
-Require-Bundle: 
- com.ibm.icu;resolution:=optional,
- org.antlr.runtime,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.item
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Item Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.item;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model,
+ org.eclipse.smarthome.model.formatting,
+ org.eclipse.smarthome.model.generator,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.items,
+ org.eclipse.smarthome.model.items.impl,
+ org.eclipse.smarthome.model.items.util,
+ org.eclipse.smarthome.model.parser.antlr,
+ org.eclipse.smarthome.model.parser.antlr.internal,
+ org.eclipse.smarthome.model.scoping,
+ org.eclipse.smarthome.model.serializer,
+ org.eclipse.smarthome.model.services,
+ org.eclipse.smarthome.model.validation
+Import-Package: javax.measure,
+ javax.measure.quantity,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.config.core,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.i18n,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.items.dto,
+ org.eclipse.smarthome.core.library.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.thing.util,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.core.types.util,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.smarthome.model.core.valueconverter,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.slf4j
+Require-Bundle: com.ibm.icu;resolution:=optional,
+ org.antlr.runtime,
+ org.apache.commons.logging;resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.item
diff --git a/bundles/model/org.eclipse.smarthome.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java b/bundles/model/org.eclipse.smarthome.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java
index 9fa51676006..e840e57a7f6 100644
--- a/bundles/model/org.eclipse.smarthome.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java
+++ b/bundles/model/org.eclipse.smarthome.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java
@@ -99,7 +99,7 @@ public URI toUri(String pathWithScheme) {
         }
         logger.debug("Path mapping could not be done for '{}', leaving it untouched", pathWithScheme);
         java.net.URI javaNetUri = java.net.URI.create(pathWithScheme);
-        return URI.createURI(super.toPath(javaNetUri));
+        return URI.createURI(toPathAsInXtext212(javaNetUri));
     }
 
     protected final String removeTrailingSlash(String path) {
@@ -158,7 +158,7 @@ private int getLastPathSegmentIndex(String currentPath) {
     private URI map(String pathWithScheme) {
         java.net.URI javaNetUri = toURI(pathWithScheme, clientLocation);
         logger.trace("Going to map path {}", javaNetUri);
-        URI ret = URI.createURI(super.toPath(javaNetUri));
+        URI ret = URI.createURI(toPathAsInXtext212(javaNetUri));
         logger.trace("Mapped path {} to {}", pathWithScheme, ret);
         return ret;
     }
@@ -167,4 +167,26 @@ private java.net.URI toURI(String pathWithScheme, String currentPath) {
         return java.net.URI.create(pathWithScheme.replace(currentPath, serverLocation));
     }
 
+    private String toPathAsInXtext212(java.net.URI uri) {
+        // org.eclipse.xtext.ide.server.UriExtensions:
+        // In Xtext 2.14 the method "String toPath(java.netURI)" has been deprecated but still exist.
+        // It delegate the logic internally to the new method "String toUriString(java.net.URI uri)".
+        // That new method seems to return a different result for folder / directories with respect to
+        // the present / absent of a trailing slash.
+
+        // The old logic removes trailing slashes if it has been present in the input.
+        // The new logic keeps trailing slashes if it has been present in the input.
+
+        // input: file:///d/
+        // output old: file:///d
+        // output new: file:///d
+
+        // input: file:///d/
+        // output old: file:///d
+        // output new: file:///d/
+
+        // We use this method now to keep the old behavior.
+        return Paths.get(uri).toUri().toString();
+    }
+
 }
diff --git a/bundles/model/org.eclipse.smarthome.model.persistence/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.persistence/META-INF/MANIFEST.MF
index 5977a4dffb5..41f477de515 100644
--- a/bundles/model/org.eclipse.smarthome.model.persistence/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.persistence/META-INF/MANIFEST.MF
@@ -1,70 +1,65 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: lib/joda-time-2.9.2.jar,.
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Persistence Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.persistence;singleton:=
- true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model.persistence,
- org.eclipse.smarthome.model.persistence.extensions,
- org.eclipse.smarthome.model.persistence.formatting,
- org.eclipse.smarthome.model.persistence.generator,
- org.eclipse.smarthome.model.persistence.parser.antlr,
- org.eclipse.smarthome.model.persistence.parser.antlr.internal,
- org.eclipse.smarthome.model.persistence.persistence,
- org.eclipse.smarthome.model.persistence.persistence.impl,
- org.eclipse.smarthome.model.persistence.persistence.util,
- org.eclipse.smarthome.model.persistence.scoping,
- org.eclipse.smarthome.model.persistence.serializer,
- org.eclipse.smarthome.model.persistence.services,
- org.eclipse.smarthome.model.persistence.validation,
- org.joda.time,
- org.joda.time.base,
- org.joda.time.chrono,
- org.joda.time.convert,
- org.joda.time.field,
- org.joda.time.format,
- org.joda.time.tz
-Import-Package: 
- com.google.common.base,
- com.google.common.collect,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.events,
- org.eclipse.smarthome.core.i18n,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.persistence,
- org.eclipse.smarthome.core.persistence.config,
- org.eclipse.smarthome.core.persistence.strategy,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.model.core,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.osgi.service.cm,
- org.osgi.service.event,
- org.slf4j
-Require-Bundle: 
- org.antlr.runtime,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;vis
- ibility:=reexport,
- org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.persistence
+Manifest-Version: 1.0
+Bundle-ClassPath: lib/joda-time-2.9.2.jar,.
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Persistence Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.persistence;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model.persistence,
+ org.eclipse.smarthome.model.persistence.extensions,
+ org.eclipse.smarthome.model.persistence.formatting,
+ org.eclipse.smarthome.model.persistence.generator,
+ org.eclipse.smarthome.model.persistence.parser.antlr,
+ org.eclipse.smarthome.model.persistence.parser.antlr.internal,
+ org.eclipse.smarthome.model.persistence.persistence,
+ org.eclipse.smarthome.model.persistence.persistence.impl,
+ org.eclipse.smarthome.model.persistence.persistence.util,
+ org.eclipse.smarthome.model.persistence.scoping,
+ org.eclipse.smarthome.model.persistence.serializer,
+ org.eclipse.smarthome.model.persistence.services,
+ org.eclipse.smarthome.model.persistence.validation,
+ org.joda.time,
+ org.joda.time.base,
+ org.joda.time.chrono,
+ org.joda.time.convert,
+ org.joda.time.field,
+ org.joda.time.format,
+ org.joda.time.tz
+Import-Package: com.google.common.base,
+ com.google.common.collect,
+ org.apache.commons.logging,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.events,
+ org.eclipse.smarthome.core.i18n,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.persistence,
+ org.eclipse.smarthome.core.persistence.config,
+ org.eclipse.smarthome.core.persistence.strategy,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.osgi.service.cm,
+ org.osgi.service.event,
+ org.slf4j
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;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.14.0",
+ org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.persistence
diff --git a/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
index 4ceb2fa7e35..346afff0037 100644
--- a/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
@@ -1,75 +1,72 @@
-Manifest-Version: 1.0
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Rule Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.rule;singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model.rule,
- org.eclipse.smarthome.model.rule.formatting,
- org.eclipse.smarthome.model.rule.jvmmodel,
- org.eclipse.smarthome.model.rule.parser.antlr,
- org.eclipse.smarthome.model.rule.parser.antlr.internal,
- org.eclipse.smarthome.model.rule.rules,
- org.eclipse.smarthome.model.rule.rules.impl,
- org.eclipse.smarthome.model.rule.rules.util,
- org.eclipse.smarthome.model.rule.scoping,
- org.eclipse.smarthome.model.rule.serializer,
- org.eclipse.smarthome.model.rule.services,
- org.eclipse.smarthome.model.rule.validation
-Import-Package: 
- com.google.common.collect,
- javax.measure,
- org.apache.commons.lang,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.events,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.library.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.library.unit,
- org.eclipse.smarthome.core.persistence,
- org.eclipse.smarthome.core.service,
- org.eclipse.smarthome.core.thing,
- org.eclipse.smarthome.core.thing.events,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.model.core,
- org.eclipse.smarthome.model.items,
- org.eclipse.smarthome.model.persistence.extensions,
- org.eclipse.smarthome.model.script,
- org.eclipse.smarthome.model.script.engine.action,
- org.eclipse.xtext.xbase.lib,
- org.joda.time,
- org.joda.time.base,
- org.osgi.framework,
- org.osgi.service.cm,
- org.osgi.service.event,
- org.osgi.util.tracker,
- org.quartz,
- org.quartz.impl,
- org.quartz.impl.matchers,
- org.quartz.spi,
- org.quartz.utils,
- org.slf4j
-Require-Bundle: 
- org.antlr.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.smarthome.model.script,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext;visibility:=reexport,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.rule
+Manifest-Version: 1.0
+Bundle-ActivationPolicy: lazy
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Rule Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.rule;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model.rule,
+ org.eclipse.smarthome.model.rule.formatting,
+ org.eclipse.smarthome.model.rule.jvmmodel,
+ org.eclipse.smarthome.model.rule.parser.antlr,
+ org.eclipse.smarthome.model.rule.parser.antlr.internal,
+ org.eclipse.smarthome.model.rule.rules,
+ org.eclipse.smarthome.model.rule.rules.impl,
+ org.eclipse.smarthome.model.rule.rules.util,
+ org.eclipse.smarthome.model.rule.scoping,
+ org.eclipse.smarthome.model.rule.serializer,
+ org.eclipse.smarthome.model.rule.services,
+ org.eclipse.smarthome.model.rule.validation
+Import-Package: com.google.common.collect,
+ javax.measure,
+ org.apache.commons.lang,
+ org.apache.commons.logging,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.events,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.library.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.library.unit,
+ org.eclipse.smarthome.core.persistence,
+ org.eclipse.smarthome.core.service,
+ org.eclipse.smarthome.core.thing,
+ org.eclipse.smarthome.core.thing.events,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.smarthome.model.items,
+ org.eclipse.smarthome.model.persistence.extensions,
+ org.eclipse.smarthome.model.script,
+ org.eclipse.smarthome.model.script.engine.action,
+ org.eclipse.xtext.xbase.lib,
+ org.joda.time,
+ org.joda.time.base,
+ org.osgi.framework,
+ org.osgi.service.cm,
+ org.osgi.service.event,
+ org.osgi.util.tracker,
+ org.quartz,
+ org.quartz.impl,
+ org.quartz.impl.matchers,
+ org.quartz.spi,
+ org.quartz.utils,
+ org.slf4j
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.smarthome.model.script,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext;visibility:=reexport,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.rule
diff --git a/bundles/model/org.eclipse.smarthome.model.script/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.script/META-INF/MANIFEST.MF
index 0132633fc36..626f42f50af 100644
--- a/bundles/model/org.eclipse.smarthome.model.script/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.script/META-INF/MANIFEST.MF
@@ -1,88 +1,85 @@
-Manifest-Version: 1.0
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Script
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.script;singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model.script,
- org.eclipse.smarthome.model.script.actions,
- org.eclipse.smarthome.model.script.engine,
- org.eclipse.smarthome.model.script.engine.action,
- org.eclipse.smarthome.model.script.extension,
- org.eclipse.smarthome.model.script.formatting,
- org.eclipse.smarthome.model.script.interpreter,
- org.eclipse.smarthome.model.script.jvmmodel,
- org.eclipse.smarthome.model.script.lib,
- org.eclipse.smarthome.model.script.parser.antlr,
- org.eclipse.smarthome.model.script.parser.antlr.internal,
- org.eclipse.smarthome.model.script.scoping,
- org.eclipse.smarthome.model.script.script,
- org.eclipse.smarthome.model.script.script.impl,
- org.eclipse.smarthome.model.script.script.util,
- org.eclipse.smarthome.model.script.serializer,
- org.eclipse.smarthome.model.script.services,
- org.eclipse.smarthome.model.script.validation
-Import-Package: 
- com.google.common.base,
- com.google.common.collect,
- javax.measure,
- javax.measure.quantity,
- org.apache.commons.io,
- org.apache.commons.lang,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.core.audio,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.events,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.items.events,
- org.eclipse.smarthome.core.library.items,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.library.unit,
- org.eclipse.smarthome.core.persistence,
- org.eclipse.smarthome.core.thing,
- org.eclipse.smarthome.core.transform.actions,
- org.eclipse.smarthome.core.types,
- org.eclipse.smarthome.core.voice,
- org.eclipse.smarthome.core.voice.text,
- org.eclipse.smarthome.io.console,
- org.eclipse.smarthome.io.console.extensions,
- org.eclipse.smarthome.io.net.exec,
- org.eclipse.smarthome.io.net.http,
- org.eclipse.smarthome.model.core,
- org.eclipse.smarthome.model.persistence.extensions,
- org.eclipse.smarthome.model.script.engine.action,
- org.eclipse.xtext.xbase.lib,
- org.joda.time,
- org.joda.time.base,
- org.osgi.framework,
- org.osgi.service.cm,
- org.osgi.util.tracker,
- org.quartz,
- org.quartz.impl,
- org.quartz.impl.calendar,
- org.quartz.impl.matchers,
- org.quartz.utils,
- org.slf4j
-Require-Bundle: 
- org.antlr.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.item,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xbase;visibility:=reexport,
- org.eclipse.xtext;visibility:=reexport,
- org.objectweb.asm;resolution:=optional
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.script
+Manifest-Version: 1.0
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Script
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.script;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model.script,
+ org.eclipse.smarthome.model.script.actions,
+ org.eclipse.smarthome.model.script.engine,
+ org.eclipse.smarthome.model.script.engine.action,
+ org.eclipse.smarthome.model.script.extension,
+ org.eclipse.smarthome.model.script.formatting,
+ org.eclipse.smarthome.model.script.interpreter,
+ org.eclipse.smarthome.model.script.jvmmodel,
+ org.eclipse.smarthome.model.script.lib,
+ org.eclipse.smarthome.model.script.parser.antlr,
+ org.eclipse.smarthome.model.script.parser.antlr.internal,
+ org.eclipse.smarthome.model.script.scoping,
+ org.eclipse.smarthome.model.script.script,
+ org.eclipse.smarthome.model.script.script.impl,
+ org.eclipse.smarthome.model.script.script.util,
+ org.eclipse.smarthome.model.script.serializer,
+ org.eclipse.smarthome.model.script.services,
+ org.eclipse.smarthome.model.script.validation
+Import-Package: com.google.common.base,
+ com.google.common.collect,
+ javax.measure,
+ javax.measure.quantity,
+ org.apache.commons.io,
+ org.apache.commons.lang,
+ org.apache.commons.logging,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.core.audio,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.events,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.items.events,
+ org.eclipse.smarthome.core.library.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.library.unit,
+ org.eclipse.smarthome.core.persistence,
+ org.eclipse.smarthome.core.thing,
+ org.eclipse.smarthome.core.transform.actions,
+ org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.core.voice,
+ org.eclipse.smarthome.core.voice.text,
+ org.eclipse.smarthome.io.console,
+ org.eclipse.smarthome.io.console.extensions,
+ org.eclipse.smarthome.io.net.exec,
+ org.eclipse.smarthome.io.net.http,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.smarthome.model.persistence.extensions,
+ org.eclipse.smarthome.model.script.engine.action,
+ org.eclipse.xtext.xbase.lib,
+ org.joda.time,
+ org.joda.time.base,
+ org.osgi.framework,
+ org.osgi.service.cm,
+ org.osgi.util.tracker,
+ org.quartz,
+ org.quartz.impl,
+ org.quartz.impl.calendar,
+ org.quartz.impl.matchers,
+ org.quartz.utils,
+ org.slf4j
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;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.14.0",
+ org.eclipse.xtext.xbase;visibility:=reexport,
+ org.eclipse.xtext;visibility:=reexport,
+ org.objectweb.asm;resolution:=optional
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.script
diff --git a/bundles/model/org.eclipse.smarthome.model.sitemap/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.sitemap/META-INF/MANIFEST.MF
index f4aa7de0557..92ad7c04f0a 100644
--- a/bundles/model/org.eclipse.smarthome.model.sitemap/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.sitemap/META-INF/MANIFEST.MF
@@ -1,44 +1,41 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Sitemap Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.sitemap;singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model,
- org.eclipse.smarthome.model.formatting,
- org.eclipse.smarthome.model.generator,
- org.eclipse.smarthome.model.parser.antlr,
- org.eclipse.smarthome.model.parser.antlr.internal,
- org.eclipse.smarthome.model.scoping,
- org.eclipse.smarthome.model.serializer,
- org.eclipse.smarthome.model.services,
- org.eclipse.smarthome.model.sitemap,
- org.eclipse.smarthome.model.sitemap.impl,
- org.eclipse.smarthome.model.sitemap.util,
- org.eclipse.smarthome.model.validation
-Import-Package: 
- org.apache.commons.lang,
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.core.items.dto,
- org.eclipse.smarthome.model.core,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.osgi.service.cm,
- org.slf4j
-Require-Bundle: 
- org.antlr.runtime,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.sitemap
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Sitemap Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.sitemap;singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model,
+ org.eclipse.smarthome.model.formatting,
+ org.eclipse.smarthome.model.generator,
+ org.eclipse.smarthome.model.parser.antlr,
+ org.eclipse.smarthome.model.parser.antlr.internal,
+ org.eclipse.smarthome.model.scoping,
+ org.eclipse.smarthome.model.serializer,
+ org.eclipse.smarthome.model.services,
+ org.eclipse.smarthome.model.sitemap,
+ org.eclipse.smarthome.model.sitemap.impl,
+ org.eclipse.smarthome.model.sitemap.util,
+ org.eclipse.smarthome.model.validation
+Import-Package: org.apache.commons.lang,
+ org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.core.items.dto,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.osgi.service.cm,
+ org.slf4j
+Require-Bundle: org.antlr.runtime,
+ org.apache.commons.logging;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.sitemap
diff --git a/bundles/model/org.eclipse.smarthome.model.thing/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.thing/META-INF/MANIFEST.MF
index aab1372e9f4..e7e981325b3 100644
--- a/bundles/model/org.eclipse.smarthome.model.thing/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.thing/META-INF/MANIFEST.MF
@@ -1,63 +1,60 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Thing Model
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.model.thing; singleton:=true
-Bundle-Vendor: Eclipse.org/SmartHome
-Bundle-Version: 0.10.0.qualifier
-Export-Package: 
- org.eclipse.smarthome.model.thing,
- org.eclipse.smarthome.model.thing.formatting,
- org.eclipse.smarthome.model.thing.generator,
- org.eclipse.smarthome.model.thing.parser.antlr,
- org.eclipse.smarthome.model.thing.parser.antlr.internal,
- org.eclipse.smarthome.model.thing.scoping,
- org.eclipse.smarthome.model.thing.serializer,
- org.eclipse.smarthome.model.thing.services,
- org.eclipse.smarthome.model.thing.thing,
- org.eclipse.smarthome.model.thing.thing.impl,
- org.eclipse.smarthome.model.thing.thing.util,
- org.eclipse.smarthome.model.thing.validation
-Import-Package: 
- org.apache.log4j,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.config.core,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.i18n,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.service,
- org.eclipse.smarthome.core.thing,
- org.eclipse.smarthome.core.thing.binding,
- org.eclipse.smarthome.core.thing.binding.builder,
- org.eclipse.smarthome.core.thing.link,
- org.eclipse.smarthome.core.thing.type,
- org.eclipse.smarthome.core.thing.util,
- org.eclipse.smarthome.core.types.util,
- org.eclipse.smarthome.core.util,
- org.eclipse.smarthome.model.core,
- org.eclipse.smarthome.model.core.valueconverter,
- org.eclipse.smarthome.model.item,
- org.eclipse.xtext.xbase.lib,
- org.osgi.framework,
- org.osgi.service.component,
- org.slf4j,
- javax.measure
-Require-Bundle: 
- org.antlr.runtime,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.smarthome.model.lazygen;resolution:=optional,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext;visibility:=reexport,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
-Service-Component: OSGI-INF/*.xml
-Automatic-Module-Name: org.eclipse.smarthome.model.thing
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SmartHome Thing Model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.smarthome.model.thing; singleton:=true
+Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Version: 0.10.0.qualifier
+Export-Package: org.eclipse.smarthome.model.thing,
+ org.eclipse.smarthome.model.thing.formatting,
+ org.eclipse.smarthome.model.thing.generator,
+ org.eclipse.smarthome.model.thing.parser.antlr,
+ org.eclipse.smarthome.model.thing.parser.antlr.internal,
+ org.eclipse.smarthome.model.thing.scoping,
+ org.eclipse.smarthome.model.thing.serializer,
+ org.eclipse.smarthome.model.thing.services,
+ org.eclipse.smarthome.model.thing.thing,
+ org.eclipse.smarthome.model.thing.thing.impl,
+ org.eclipse.smarthome.model.thing.thing.util,
+ org.eclipse.smarthome.model.thing.validation
+Import-Package: org.apache.log4j,
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.smarthome.config.core,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.i18n,
+ org.eclipse.smarthome.core.items,
+ org.eclipse.smarthome.core.service,
+ org.eclipse.smarthome.core.thing,
+ org.eclipse.smarthome.core.thing.binding,
+ org.eclipse.smarthome.core.thing.binding.builder,
+ org.eclipse.smarthome.core.thing.link,
+ org.eclipse.smarthome.core.thing.type,
+ org.eclipse.smarthome.core.thing.util,
+ org.eclipse.smarthome.core.types.util,
+ org.eclipse.smarthome.core.util,
+ org.eclipse.smarthome.model.core,
+ org.eclipse.smarthome.model.core.valueconverter,
+ org.eclipse.smarthome.model.item,
+ org.eclipse.xtext.xbase.lib,
+ org.osgi.framework,
+ org.osgi.service.component,
+ org.slf4j,
+ javax.measure
+Require-Bundle: org.antlr.runtime,
+ org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.smarthome.model.lazygen;resolution:=optional,
+ org.eclipse.xtend.lib;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.14.0",
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext;visibility:=reexport,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
+Service-Component: OSGI-INF/*.xml
+Automatic-Module-Name: org.eclipse.smarthome.model.thing
diff --git a/features/karaf/esh-core/src/main/feature/feature.xml b/features/karaf/esh-core/src/main/feature/feature.xml
index efdb48f5010..6dabefd14ff 100644
--- a/features/karaf/esh-core/src/main/feature/feature.xml
+++ b/features/karaf/esh-core/src/main/feature/feature.xml
@@ -21,7 +21,7 @@
     <requirement>esh.tp;filter:="(feature=base)"</requirement>
     <feature dependency="true">esh.tp-base</feature>
 
-    <requirement>esh.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.12.0)(!(version&gt;=2.13.0)))"</requirement>
+    <requirement>esh.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.14.0)(!(version&gt;=2.15.0)))"</requirement>
     <feature dependency="true">esh.tp-xtext</feature>
 
     <requirement>esh.tp;filter:="(feature=jax-rs)"</requirement>
@@ -520,7 +520,7 @@
 
   <feature name="esh-model-lsp" version="${project.version}">
 
-    <requirement>esh.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.12.0)(!(version&gt;=2.13.0)))"</requirement>
+    <requirement>esh.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.14.0)(!(version&gt;=2.15.0)))"</requirement>
     <feature dependency="true">esh.tp-xtext-ide</feature>
 
     <requirement>esh.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.2.0)(!(version&gt;=0.3.0)))"</requirement>
diff --git a/features/karaf/esh-tp/src/main/feature/feature.xml b/features/karaf/esh-tp/src/main/feature/feature.xml
index 118baf81c93..b76ea990523 100644
--- a/features/karaf/esh-tp/src/main/feature/feature.xml
+++ b/features/karaf/esh-tp/src/main/feature/feature.xml
@@ -158,23 +158,24 @@
   </feature>
 
   <feature name="esh.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
-    <capability>esh.tp;feature=xtext;version=2.12.0</capability>
+    <capability>esh.tp;feature=xtext;version=2.14.0</capability>
 
-    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.12.0</bundle>
+    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.14.0</bundle>
 
-    <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.11.0-v20150805-0538</bundle>
-    <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.11.1-v20150805-0538</bundle>
-    <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.11.1-v20150805-0538</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/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.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.14.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.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.12.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.14.0</bundle>
 
     <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
@@ -192,17 +193,16 @@
 
     <!-- Add ASM package -->
     <!-- org.eclipse.xtext.common.types is using Require-Bundle -->
-    <bundle dependency="true">mvn:de.maggu2810.requirebundle.fix/org.objectweb.asm/5.0.2</bundle>
-    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
+    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/6.1.1</bundle>
   </feature>
 
   <feature name="esh.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
-    <capability>esh.tp;feature=xtext-ide;version=2.12.0</capability>
+    <capability>esh.tp;feature=xtext-ide;version=2.14.0</capability>
     <feature dependency="true">esh.tp-xtext</feature>
 
     <!-- Support for the Language Server Protocol -->
-    <bundle dependency="true">mvn:de.maggu2810.thirdparty.org.eclipse.xtext/org.eclipse.xtext.ide/2.12.0.sp2</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.12.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.14.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.14.0</bundle>
   </feature>
 
   <!--
diff --git a/pom.xml b/pom.xml
index d80fb3b0f26..76d7afa2d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <maven.compiler.compilerVersion>${esh.java.version}</maven.compiler.compilerVersion>
     <tycho-version>1.2.0</tycho-version>
     <tycho-groupid>org.eclipse.tycho</tycho-groupid>
-    <xtext-version>2.12.0</xtext-version>
+    <xtext-version>2.14.0</xtext-version>
     <karaf.version>4.2.1</karaf.version>
     <ds-annotations.version>1.2.10</ds-annotations.version>
     <jdt-annotations.version>2.1.0</jdt-annotations.version>
diff --git a/targetplatform/EclipseSmartHome.setup b/targetplatform/EclipseSmartHome.setup
index 0a2edadee80..6f5f323196d 100644
--- a/targetplatform/EclipseSmartHome.setup
+++ b/targetplatform/EclipseSmartHome.setup
@@ -2359,10 +2359,10 @@
           name="org.eclipse.m2e.logback.feature.feature.group"/>
       <requirement
           name="org.eclipse.xtend.sdk.feature.group"
-          versionRange="[2.12.0,2.13.0)"/>
+          versionRange="[2.14.0,2.15.0)"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.12.0,2.13.0)"/>
+          versionRange="[2.14.0,2.15.0)"/>
       <requirement
           name="org.eclipse.emf.mwe2.language.sdk.feature.group"
           versionRange="[2.9.1,2.10.0)"/>
@@ -2389,8 +2389,6 @@
           name="org.eclipse.wst.jsdt.feature.feature.group"/>
       <requirement
           name="org.eclipse.wst.web_ui.feature.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
       <repository
           url="http://dist.springsource.org/snapshot/GRECLIPSE/e4.8"/>
     </setupTask>
diff --git a/targetplatform/smarthome.target b/targetplatform/smarthome.target
index b2714c03550..1744393e385 100644
--- a/targetplatform/smarthome.target
+++ b/targetplatform/smarthome.target
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="SmartHome" sequenceNumber="130">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="SmartHome" sequenceNumber="131">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.inject" version="3.0.0.v201312141243"/>
@@ -72,25 +71,6 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtend" version="2.2.0.v201605260315"/>
-<repository location="http://download.eclipse.org/releases/oxygen/201709271000"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.9.1.201705291011"/>
-<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="2.9.1.201705291011"/>
-<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.1.201705291011"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150601-0402"/>
-<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.11/core/R201506010402"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/lsp4j/updates/releases/0.2.1"/>
 </location>
@@ -194,5 +174,12 @@
 <repository location="https://dl.bintray.com/openhab/p2/openhab-deps-repo/1.0.28"/>
 </location>
 <location path="${project_loc:targetplatform}/third-party" type="Directory"/>
+    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+        <unit id="org.eclipse.xtext.sdk.feature.group" version="2.14.0.v20180523-0937"/>
+        <repository location="http://download.eclipse.org/releases/photon"/>
+        <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.1.201705291011"/>
+        <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.9.1.201705291011"/>
+        <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/>
+    </location>
 </locations>
 </target>