diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index a2189c0dd..c07ada111 100644
--- a/bom/compile-model/pom.xml
+++ b/bom/compile-model/pom.xml
@@ -17,8 +17,8 @@
   <properties>
     <emf.1.version>2.12.0</emf.1.version>
     <emf.3.version>2.11.0</emf.3.version>
-    <emf.mwe.version>1.3.21.201705291010</emf.mwe.version>
-    <emf.mwe2.version>2.9.1.201705291010</emf.mwe2.version>
+    <emf.mwe.version>1.4.0</emf.mwe.version>
+    <emf.mwe2.version>2.10.0</emf.mwe2.version>
   </properties>
 
   <dependencies>
@@ -127,6 +127,12 @@
       <artifactId>org.eclipse.xtext</artifactId>
       <version>${xtext.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.platform</groupId>
+          <artifactId>org.eclipse.osgi</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index a4f699c0c..90c816850 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -661,13 +661,13 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-bundleutils</artifactId>
-      <version>4.6</version>
+      <version>4.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-finder</artifactId>
-      <version>4.6</version>
+      <version>4.12</version>
       <scope>compile</scope>
     </dependency>
 
@@ -675,7 +675,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>15.0</version>
+      <version>21.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -713,31 +713,31 @@
     <dependency>
       <groupId>org.eclipse.xtend</groupId>
       <artifactId>org.eclipse.xtend.lib</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtend</groupId>
       <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.common.types</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.ide</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -749,25 +749,25 @@
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.util</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase.ide</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -815,7 +815,7 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>6.1.1</version>
+      <version>7.0</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd
index a3f563684..cbe06521d 100644
--- a/bundles/org.openhab.core.model.item/bnd.bnd
+++ b/bundles/org.openhab.core.model.item/bnd.bnd
@@ -45,4 +45,4 @@ Require-Bundle: com.ibm.icu;resolution:=optional,\
  org.eclipse.xtext.common.types,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.0"
diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd
index c93028e27..72d9b372a 100644
--- a/bundles/org.openhab.core.model.persistence/bnd.bnd
+++ b/bundles/org.openhab.core.model.persistence/bnd.bnd
@@ -42,6 +42,6 @@ Require-Bundle: org.antlr.runtime,\
  org.eclipse.xtext.common.types,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.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
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.0",\
+ org.eclipse.xtext.xbase;bundle-version="2.17.0";resolution:=optional;visibility:=reexport,\
+ org.eclipse.xtext;bundle-version="2.17.0";visibility:=reexport
diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd
index f76ebe277..73b3740ae 100644
--- a/bundles/org.openhab.core.model.rule/bnd.bnd
+++ b/bundles/org.openhab.core.model.rule/bnd.bnd
@@ -53,6 +53,6 @@ Require-Bundle: org.antlr.runtime,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
  org.eclipse.xtext.xbase,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",\
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.0",\
  org.eclipse.xtext;visibility:=reexport,\
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional
diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd
index f2431f37e..ec97be88f 100644
--- a/bundles/org.openhab.core.model.script/bnd.bnd
+++ b/bundles/org.openhab.core.model.script/bnd.bnd
@@ -59,7 +59,7 @@ Require-Bundle: org.antlr.runtime,\
  org.eclipse.xtext.common.types,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",\
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.0",\
  org.eclipse.xtext.xbase;visibility:=reexport,\
  org.eclipse.xtext;visibility:=reexport,\
  org.objectweb.asm;resolution:=optional
diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd
index e44540445..57dae4e95 100644
--- a/bundles/org.openhab.core.model.sitemap/bnd.bnd
+++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd
@@ -30,4 +30,4 @@ Require-Bundle: org.antlr.runtime,\
  org.eclipse.xtext,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.0"
diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd
index f79214f60..46c3bc834 100644
--- a/bundles/org.openhab.core.model.thing/bnd.bnd
+++ b/bundles/org.openhab.core.model.thing/bnd.bnd
@@ -46,7 +46,7 @@ Require-Bundle: org.antlr.runtime,\
  org.eclipse.xtext.common.types,\
  org.eclipse.xtext.generator;resolution:=optional,\
  org.eclipse.xtext.util,\
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",\
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.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
+ org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional
diff --git a/demo/app/app.bndrun b/demo/app/app.bndrun
index c1287734c..64e23b295 100644
--- a/demo/app/app.bndrun
+++ b/demo/app/app.bndrun
@@ -73,9 +73,13 @@ feature.openhab-model-runtime-all: \
 #
 
 -runbundles: \
+	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.eclipsesource.jaxrs.jersey-all;version='[2.22.2,2.22.3)',\
 	com.eclipsesource.jaxrs.publisher;version='[5.3.1,5.3.2)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	com.google.guava;version='[21.0.0,21.0.1)',\
 	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
 	joda-time;version='[2.9.2,2.9.3)',\
@@ -98,12 +102,12 @@ feature.openhab-model-runtime-all: \
 	org.apache.felix.webconsole;version='[4.3.4,4.3.5)',\
 	org.apache.felix.webconsole.plugins.ds;version='[2.0.8,2.0.9)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
+	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
+	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
 	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
+	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
 	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
@@ -117,29 +121,17 @@ feature.openhab-model-runtime-all: \
 	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.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
+	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.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.utils;version='[2.4.0,2.4.1)',\
 	org.mapdb.mapdb;version='[1.0.9,1.0.10)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;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.osgi.service.event;version='[1.4.0,1.4.1)',\
-	org.osgi.service.metatype;version='[1.4.0,1.4.1)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
+	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;version='[2.5.0,2.5.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
 	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
@@ -178,7 +170,13 @@ feature.openhab-model-runtime-all: \
 	org.openhab.core.thing.xml;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)',\
-	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
+	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
+	org.ops4j.pax.web.pax-web-jetty;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.osgi.service.event;version='[1.4.0,1.4.1)',\
+	org.osgi.service.metatype;version='[1.4.0,1.4.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	com.google.gson;version='[2.8.2,2.8.3)'
+	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
+	tec.uom.se;version='[1.0.8,1.0.9)'
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index db87691d1..65213a1e9 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -25,7 +25,7 @@
 
     <feature dependency="true">openhab.tp-gson</feature>
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.14.0)(!(version&gt;=2.15.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement>
     <feature dependency="true">openhab.tp-xtext</feature>
 
     <requirement>openhab.tp;filter:="(feature=jax-rs)"</requirement>
@@ -468,10 +468,10 @@
 
   <feature name="openhab-core-model-lsp" version="${project.version}">
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.14.0)(!(version&gt;=2.15.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement>
     <feature dependency="true">openhab.tp-xtext-ide</feature>
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.4.0)(!(version&gt;=0.5.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.6.0)(!(version&gt;=0.7.0)))"</requirement>
     <feature dependency="true">openhab.tp-lsp4j</feature>
 
     <feature>openhab-core-model-item-ide</feature>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 371251cbc..8f44eb58d 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -124,9 +124,9 @@
   </feature>
 
   <feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
-    <capability>openhab.tp;feature=lsp4j;version=0.4.1</capability>
-    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.4.1</bundle>
-    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.4.1</bundle>
+    <capability>openhab.tp;feature=lsp4j;version=0.6.0</capability>
+    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.6.0</bundle>
+    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.6.0</bundle>
 
     <feature dependency="true">openhab.tp-gson</feature>
     <feature dependency="true">openhab.tp-xtext</feature>
@@ -158,26 +158,26 @@
   </feature>
 
   <feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
-    <capability>openhab.tp;feature=xtext;version=2.14.0</capability>
+    <capability>openhab.tp;feature=xtext;version=2.17.0</capability>
 
-    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.14.0</bundle>
+    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.17.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:org.eclipse.xtext/org.eclipse.xtext.common.types/2.17.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.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:org.eclipse.xtext/org.eclipse.xtext.xbase/2.17.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.smap/2.17.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.17.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.macro/2.17.0</bundle>
 
-    <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
+    <bundle dependency="true">mvn:com.google.guava/guava/21.0</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>-->
@@ -187,22 +187,22 @@
     <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:org.eclipse.platform/org.eclipse.equinox.common/3.8.0</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.registry/3.6.100</bundle>
     <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle>
 
     <!-- Add ASM package -->
     <!-- org.eclipse.xtext.common.types is using Require-Bundle -->
-    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/6.1.1</bundle>
+    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.0</bundle>
   </feature>
 
   <feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
-    <capability>openhab.tp;feature=xtext-ide;version=2.14.0</capability>
+    <capability>openhab.tp;feature=xtext-ide;version=2.17.0</capability>
     <feature dependency="true">openhab.tp-xtext</feature>
 
     <!-- Support for the Language Server Protocol -->
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.14.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.14.0</bundle>
+    <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.xbase.ide/2.17.0</bundle>
   </feature>
 
   <!--
diff --git a/features/p2/poms/pom.xml b/features/p2/poms/pom.xml
index e98c9205b..efdb731e0 100644
--- a/features/p2/poms/pom.xml
+++ b/features/p2/poms/pom.xml
@@ -42,7 +42,7 @@
     <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
     <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
 
-    <ohdr.version>1.0.40</ohdr.version>
+    <ohdr.version>1.0.41</ohdr.version>
     <repo.version>2.5.x</repo.version>
     <karaf.version>4.2.2</karaf.version>
     <jetty.version>9.4.12.v20180830</jetty.version>
@@ -53,7 +53,7 @@
     <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
     <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
     <license.maven.plugin.version>2.10</license.maven.plugin.version>
-    <tycho-version>1.2.0</tycho-version>
+    <tycho-version>1.3.0</tycho-version>
     <tycho-groupid>org.eclipse.tycho</tycho-groupid>
     <jdt-annotations.version>2.1.0</jdt-annotations.version>
     <ds-annotations.version>1.2.10</ds-annotations.version>
diff --git a/features/p2/poms/tycho/pom.xml b/features/p2/poms/tycho/pom.xml
index c921c047d..b1e0f5bb3 100644
--- a/features/p2/poms/tycho/pom.xml
+++ b/features/p2/poms/tycho/pom.xml
@@ -42,7 +42,7 @@
     <!-- Eclipse p2 repository -->
     <repository>
       <id>eclipse-photon</id>
-      <url>http://download.eclipse.org/releases/photon</url>
+      <url>http://download.eclipse.org/releases/2019-03</url>
       <layout>p2</layout>
     </repository>
   </repositories>
diff --git a/features/p2/repo/pom.xml b/features/p2/repo/pom.xml
index 2e2ae59ef..1069c707c 100644
--- a/features/p2/repo/pom.xml
+++ b/features/p2/repo/pom.xml
@@ -26,7 +26,7 @@
         <plugin>
           <groupId>org.reficio</groupId>
           <artifactId>p2-maven-plugin</artifactId>
-          <version>1.2.0</version>
+          <version>1.3.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -492,4 +492,4 @@
       </resource>
     </resources>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/itests/org.openhab.core.audio.tests/itest.bndrun b/itests/org.openhab.core.audio.tests/itest.bndrun
index 71359c02a..53a02f42f 100644
--- a/itests/org.openhab.core.audio.tests/itest.bndrun
+++ b/itests/org.openhab.core.audio.tests/itest.bndrun
@@ -19,8 +19,6 @@ Fragment-Host: org.openhab.core.audio
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.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.http;version='[9.4.11,9.4.12)',\
@@ -31,9 +29,6 @@ Fragment-Host: org.openhab.core.audio
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
 	org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
@@ -57,4 +52,9 @@ Fragment-Host: org.openhab.core.audio
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
-	com.google.gson;version='[2.8.2,2.8.3)'
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	org.apache.xbean.bundleutils;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)'
diff --git a/itests/org.openhab.core.compat1x.tests/itest.bndrun b/itests/org.openhab.core.compat1x.tests/itest.bndrun
index 47043ab7e..4f2a9452d 100644
--- a/itests/org.openhab.core.compat1x.tests/itest.bndrun
+++ b/itests/org.openhab.core.compat1x.tests/itest.bndrun
@@ -9,7 +9,6 @@ Fragment-Host: org.openhab.core.compat1x
 # done
 #
 -runbundles: \
-	com.google.guava;version='[15.0.0,15.0.1)',\
 	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
 	joda-time;version='[2.9.2,2.9.3)',\
@@ -24,12 +23,9 @@ Fragment-Host: org.openhab.core.compat1x
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.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.http;version='[9.4.11,9.4.12)',\
@@ -43,18 +39,8 @@ Fragment-Host: org.openhab.core.compat1x
 	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.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
 	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
@@ -91,5 +77,19 @@ Fragment-Host: org.openhab.core.compat1x
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
+	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
+	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
+	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)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
+	com.google.guava;version='[21.0.0,21.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index adec0a2d8..e5bb77ebb 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -13,7 +13,6 @@ Fragment-Host: org.openhab.core.model.thing
 # done
 #
 -runbundles: \
-	com.google.guava;version='[15.0.0,15.0.1)',\
 	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
 	joda-time;version='[2.9.2,2.9.3)',\
@@ -26,12 +25,9 @@ Fragment-Host: org.openhab.core.model.thing
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.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.http;version='[9.4.11,9.4.12)',\
@@ -44,18 +40,8 @@ Fragment-Host: org.openhab.core.model.thing
 	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.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
@@ -100,5 +86,19 @@ Fragment-Host: org.openhab.core.model.thing
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
+	com.google.guava;version='[21.0.0,21.0.1)',\
+	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
+	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
+	org.eclipse.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)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.transform.tests/itest.bndrun b/itests/org.openhab.core.transform.tests/itest.bndrun
index 41289b95c..5996b9ac2 100644
--- a/itests/org.openhab.core.transform.tests/itest.bndrun
+++ b/itests/org.openhab.core.transform.tests/itest.bndrun
@@ -26,5 +26,5 @@ Fragment-Host: org.openhab.core.transform
 	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	com.google.gson;version='[2.8.2,2.8.3)'
\ No newline at end of file
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)'
\ No newline at end of file
diff --git a/itests/org.openhab.core.ui.icon.tests/itest.bndrun b/itests/org.openhab.core.ui.icon.tests/itest.bndrun
index 52692b16a..37b8f7da5 100644
--- a/itests/org.openhab.core.ui.icon.tests/itest.bndrun
+++ b/itests/org.openhab.core.ui.icon.tests/itest.bndrun
@@ -16,8 +16,6 @@ Fragment-Host: org.openhab.core.ui.icon
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
@@ -27,9 +25,6 @@ Fragment-Host: org.openhab.core.ui.icon
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
 	org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
@@ -52,5 +47,10 @@ Fragment-Host: org.openhab.core.ui.icon
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
-	com.google.gson;version='[2.8.2,2.8.3)'
+	org.apache.xbean.bundleutils;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)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)'
diff --git a/itests/org.openhab.core.ui.tests/itest.bndrun b/itests/org.openhab.core.ui.tests/itest.bndrun
index d89e97463..b6660bd84 100644
--- a/itests/org.openhab.core.ui.tests/itest.bndrun
+++ b/itests/org.openhab.core.ui.tests/itest.bndrun
@@ -9,8 +9,6 @@ Fragment-Host: org.openhab.core.ui
 # done
 #
 -runbundles: \
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
 	joda-time;version='[2.9.2,2.9.3)',\
 	log4j;version='[1.2.17,1.2.18)',\
@@ -22,12 +20,9 @@ Fragment-Host: org.openhab.core.ui
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.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.http;version='[9.4.11,9.4.12)',\
@@ -41,19 +36,9 @@ Fragment-Host: org.openhab.core.ui
 	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.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
@@ -92,5 +77,20 @@ Fragment-Host: org.openhab.core.ui
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
+	org.apache.xbean.bundleutils;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)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
+	com.google.guava;version='[21.0.0,21.0.1)',\
+	com.google.inject;version='[3.0.0,3.0.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index abce75e74..44b65f735 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -16,8 +16,6 @@ Fragment-Host: org.openhab.core.voice
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
@@ -26,9 +24,6 @@ Fragment-Host: org.openhab.core.voice
 	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
@@ -51,4 +46,9 @@ Fragment-Host: org.openhab.core.voice
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	com.google.gson;version='[2.8.2,2.8.3)'
\ No newline at end of file
+	org.apache.xbean.bundleutils;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)'
diff --git a/pom.xml b/pom.xml
index 8a839b60c..f0ea57683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <karaf.version>4.2.1</karaf.version>
     <sat.version>0.6.1</sat.version>
     <slf4j.version>1.7.21</slf4j.version>
-    <xtext.version>2.14.0</xtext.version>
+    <xtext.version>2.17.0</xtext.version>
   </properties>
 
   <repositories>