[543220] Dependency and version updates

 * Version is now 2.2.0-SNAPSHOT
 * Support VIATRA 2.2.0
 * Requires Xtext 2.16

Change-Id: I2edb046ba672a32c34b311d93649f6dd51cce31a
Signed-off-by: Zoltan Ujhelyi <zoltan.ujhelyi@incquerylabs.com>

83 files changed, 106 insertions, 115 deletions

diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
index 123f2f5..9afbcee 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Live Validation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries.validation;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.queries,
   com.google.guava,
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
index 7704c2e..ac69ddb 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.queries.validation</artifactId>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
index 945f8c3..4136f15 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Viewers
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.view;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.model,
  org.eclipse.ui,
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
index 4fbc2e3..da68023 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.view</artifactId>
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
index 57f421d..1e76bee 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator UI Contributions
 Bundle-Vendor: Eclipse VIATRA Project
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.application.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.databinding.observable,
  org.eclipse.emf.edit,
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
index f83c949..e373519 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.application.ui</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
index 1a94daf..f0823f1 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment.edit;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.deployment.provider.DeploymentEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
index cf3155e..ce652fa 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.deployment.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
index ce237e1..ad64859 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
index c019166..27f9bf5 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.deployment</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
index 78a1081..e23fa2d 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.edit;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.provider.ModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
index c460080..c5f75dc 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
index 0a43671..11214de 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.editor;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.presentation.ModelEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
index b82a369..4ed7ba4 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model.editor</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
index e6291e6..0142ae5 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
index c6dd6af..ebc0163 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.model</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
index ebc339b..67bdb9f 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability.edit;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.viatra.examples.cps.traceability.provider.TraceabilityEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
index 03b90b5..00b65ff 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.traceability.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
index 6b9577a..b7ffb68 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
index 3b5db4b..7f0e40a 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.traceability</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
index 3c63de7..0e9260e 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Model Generator Implementation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.generator,
   org.eclipse.viatra.examples.cps.generator.dtos,
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
index d12c4ff..a0aa192 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.generator</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
index 82d9d84..b76a5eb 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.planexecutor;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.planexecutor,
  org.eclipse.viatra.examples.cps.planexecutor.api
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
index 6afb619..2d174d2 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.planexecutor</artifactId>
diff --git a/cps/pom.xml b/cps/pom.xml
index b0d0cb6..3139382 100644
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.viatra.examples.cps</groupId>
 	<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<name>CPS Demonstrator</name>
 	<url></url>
 	<packaging>pom</packaging>
@@ -77,10 +77,10 @@
 		</profile>
 	</profiles>
 	<properties>
-		<tycho.version>1.0.0</tycho.version>
-		<xtend.compiler.version>2.13.0</xtend.compiler.version>
+		<tycho.version>1.3.0</tycho.version>
+		<xtend.compiler.version>2.16.0</xtend.compiler.version>
 		<viatra.repository.url>http://download.eclipse.org/viatra/updates/integration</viatra.repository.url>
-		<viatra.compiler.version>2.0.0-SNAPSHOT</viatra.compiler.version>
+		<viatra.compiler.version>2.2.0-SNAPSHOT</viatra.compiler.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -222,13 +222,6 @@
 					<groupId>org.eclipse.xtend</groupId>
 					<artifactId>xtend-maven-plugin</artifactId>
 					<version>${xtend.compiler.version}</version>
-					<dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.platform</groupId>
-                            <artifactId>org.eclipse.equinox.common</artifactId>
-                            <version>3.10.0</version>
-                        </dependency>
-                    </dependencies>
 					<configuration>
 						<!-- need to prefix by basedir to generate to currently built module -->
 						<outputDirectory>${basedir}/xtend-gen</outputDirectory>
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
index 630fa38..1373904 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Query Definitions
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.deployment.common,
   org.eclipse.viatra.examples.cps.deployment.viewer,
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
index ff03946..1865e5d 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.queries</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
index 27a932b..33e0d64 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.application.dependencies.feature"
       label="CPS Demonstrator Application dependencies"
-      version="2.1.0.qualifier"
+      version="2.2.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
index 205a9ca..b405fb2 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
index 8a9cf8a..9d02737 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.application.feature"
       label="CPS Demonstrator Application"
-      version="2.1.0.qualifier"
+      version="2.2.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
index 90c3d7b..94735e0 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
index a04cee0..d251af0 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
@@ -129,9 +129,9 @@
       <feature id="org.eclipse.viatra.addon.viewers.runtime.feature"/>
       <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature"/>
       <feature id="org.eclipse.viatra.addon.viewers.tooling.feature"/>
-      <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.1.0.qualifier"/>
-      <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.1.0.qualifier"/>
-      <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.1.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.2.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.2.0.qualifier"/>
+      <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.2.0.qualifier"/>
       <feature id="org.eclipse.viatra.query.language.feature"/>
       <feature id="org.eclipse.viatra.query.runtime.feature"/>
       <feature id="org.eclipse.viatra.query.sdk.feature"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
index c135ae0..41e5e41 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
@@ -6,7 +6,7 @@
     <parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.eclipse.viatra.examples.cps.application.product</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
index b266265..66feb95 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
@@ -22,7 +22,7 @@
 	
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
 		<relativePath>../..</relativePath>
 	</parent>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
index 5cd5a4f..dbb50bf 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.viatra.examples.cps.metamodel.feature"
       label="CPS metamodels"
-      version="2.1.0.qualifier"
+      version="2.2.0.qualifier"
       provider-name="IncQuery Labs Ltd."
       license-feature="org.eclipse.license">
 
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
index 932285a..02211ac 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
index 0ece6a5..0a70747 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
+++ b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
@@ -95,21 +95,21 @@
       label="Demo">
     <requirement
         name="org.eclipse.viatra.query.sdk.feature.source.feature.group"
-        versionRange="[2.0.0,3.0.0)"/>
+        versionRange="[2.2.0,3.0.0)"/>
     <requirement
         name="org.eclipse.viatra.query.testing.sdk.feature.feature.group"/>
     <requirement
         name="org.eclipse.viatra.addon.viewers.tooling.feature.feature.group"
-        versionRange="[2.0.0,3.0.0)"/>
+        versionRange="[2.2.0,3.0.0)"/>
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"
-        versionRange="[2.13.0,3.0.0)"/>
+        versionRange="[2.16.0,3.0.0)"/>
     <requirement
         name="com.google.inject.multibindings"
         versionRange="[3.0.0,4.0.0)"/>
     <requirement
         name="org.eclipse.viatra.transformation.runtime.emf.feature.feature.group"
-        versionRange="[2.0.0,3.0.0)"/>
+        versionRange="[2.2.0,3.0.0)"/>
     <requirement
         name="org.eclipse.emf.sdk.feature.group"/>
     <requirement
@@ -125,7 +125,7 @@
     <repository
         url="${viatra.repository.url}"/>
     <repository
-        url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0"/>
+        url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.16.0"/>
     <repository
         url="http://download.eclipse.org/tools/gef/updates/releases/5.0.0_gef-master_4403"/>
     <repository
@@ -141,7 +141,7 @@
           name="org.eclipse.sdk.feature.group"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.13.0,3.0.0)"/>
+          versionRange="[2.16.0,3.0.0)"/>
       <requirement
           name="org.eclipse.emf.sdk.feature.group"
           versionRange="[2.9.0,3.0.0)"/>
@@ -169,7 +169,7 @@
           name="org.eclipse.gef.layout.sdk.feature.group"/>
       <requirement
           name="org.eclipse.viatra.transformation.debug.feature.feature.group"
-          versionRange="[0.20.0,0.22.0)"/>
+          versionRange="[0.22.0,0.23.0)"/>
       <requirement
           name="org.eclipse.draw2d.feature.group"/>
       <requirement
@@ -181,7 +181,7 @@
         <repository
             url="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
         <repository
-            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0"/>
+            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.16.0"/>
         <repository
             url="${viatra.repository.url}"/>
         <repository
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
index 7481dee..dfae1b6 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
@@ -7,16 +7,16 @@
             <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
             <unit id="org.eclipse.emf.transaction.feature.group" version="1.11.0.201706061339"/>
             <unit id="org.eclipse.emf.validation.feature.group" version="1.11.0.201706061352"/>
-            <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.1.v20170928-1405"/>
-            <unit id="org.eclipse.sdk.feature.group" version="4.7.1.v20171009-0537"/>
+            <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.4.v20180322-2228"/>
+            <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
             <unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>
             <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.1.201705291011"/>
-            <repository location="http://download.eclipse.org/releases/oxygen/201710111001"/>
+            <repository location="http://download.eclipse.org/releases/oxygen/201804111000"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
-            <unit id="org.eclipse.xtext.redist.feature.group" version="2.13.0.v20171020-0920"/>
-            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0"/>
+            <unit id="org.eclipse.xtext.sdk.feature.group" version="2.16.0.v20181203-1555"/>
+            <unit id="org.eclipse.xtext.redist.feature.group" version="2.16.0.v20181203-1555"/>
+            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.16.0"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.1.0.201712060601"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
index 91a9f6a..d002b88 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.target</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
index f17ab93..8e3a95b 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_2.1.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.1.0.qualifier">
+   <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_2.2.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.2.0.qualifier">
       <category name="org.eclipse.viatra.examples.cps"/>
    </feature>
-   <feature url="features/org.eclipse.viatra.examples.cps.application.feature_2.1.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="2.1.0.qualifier">
+   <feature url="features/org.eclipse.viatra.examples.cps.application.feature_2.2.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="2.2.0.qualifier">
       <category name="org.eclipse.viatra.examples.cps"/>
    </feature>
    <category-def name="org.eclipse.viatra.examples.cps" label="CPS Demonstrator"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
index beb0312..7248833 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<packaging>eclipse-repository</packaging>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
index 0ef00eb..cf9df62 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model Generator Tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.generator.tests
 Require-Bundle: org.eclipse.xtend.lib,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
index 34732d3..1b18399 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.generator.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
index f42d4c1..87f4e9d 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Tests Common
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.tests.util
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.tests.util
 Require-Bundle: org.eclipse.xtend.lib,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
index 826e4db..22a9527 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.tests.util</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
index 49df4ed..27021dc 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.tests
 Require-Bundle: com.google.guava,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
index 12eb84c..0813284 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
index 4c5b6fd..9532fd8 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Tests for M2T Transformation
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.apache.log4j;bundle-version="1.2.15",
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
index 5863c58..3fdd8cc 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
index 415c285..01d66e7 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator serializer tests
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.test
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
index 62f5acd..2ce478f 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.test</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
index 52df47a..5af8c28 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.batch.eiq
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq,
   org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq.queries
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
index 52d2ea4..335a5ea 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
index 1dd34ef..483720f 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Optimized
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized
 Bundle-Vendor: IncQueryLabs Ltd.
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
index 02bbcc6..7c28cef 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
index f38ba89..de7cdf6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simple
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple
 Require-Bundle: com.google.guava,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
index f775628..6ac59cb 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.simple</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
index 72569d0..5b2875f 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra,
   org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra.patterns
 Require-Bundle: org.eclipse.emf.ecore,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.emf.ecore,
   org.eclipse.viatra.query.runtime,
   org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.22.0)"
+  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.23.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
index c44efe4..4840007 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
index 725226c..b16f97e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Aggr
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr.queries
 Require-Bundle: com.google.guava,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
index 150eabb..002271f 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
index 15f86b2..b53f5b5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Model-To-Model Transformations
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.expl.queries
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
index 074c65e..45f15e0 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.expl</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
index 0ca3cef..fa7227a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.incr.qrt
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.queries,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.rules
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
index 28191a0..3e95cfc 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
index 6b37707..0d41e0e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra,
   org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.patterns
 Require-Bundle: org.eclipse.emf.ecore,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.emf.ecore,
   org.eclipse.viatra.query.runtime,
   org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,3.0.0)",
-  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.22.0)"
+  org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.23.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
index d54edb0..3667831 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
 		<groupId>org.eclipse.viatra.examples.cps</groupId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
index 61edd7f..98aafb5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Transformation Launcher
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.launcher
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.launcher
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
index 92e737e..dac5e94 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.launcher</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
index 03fde8d..f2de5c9 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2M Transformation Util
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.util
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.guava,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
index f1e3380..7438bae 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2m.util</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
index a829a74..1a5cfd4 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator Proto Distribution Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.distributed
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.distributed
-Require-Bundle: org.eclipse.xtend;bundle-version="2.0.0",
-  org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
+Require-Bundle: org.eclipse.xtext.xbase.lib,
   org.eclipse.viatra.examples.cps.deployment,
   org.apache.log4j;bundle-version="1.2.15",
   org.eclipse.viatra.examples.cps.queries,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
index 7892557..06e2d7f 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.distributed</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
index df52b10..d72bfd6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator JDT M2T Generator
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.jdt
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.jdt
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
index 3ac216b..43d4fca 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t.jdt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
index 0730f98..79fcde6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
@@ -2,20 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator M2T API
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.api,
   org.eclipse.viatra.examples.cps.xform.m2t.exceptions,
   org.eclipse.viatra.examples.cps.xform.m2t.monitor,
   org.eclipse.viatra.examples.cps.xform.m2t.util
-Require-Bundle: org.eclipse.xtend;bundle-version="2.0.0",
-  org.eclipse.xtext.xbase.lib;bundle-version="2.9.0",
+Require-Bundle: org.eclipse.xtext.xbase.lib,
   org.eclipse.viatra.examples.cps.deployment,
   org.apache.log4j;bundle-version="1.2.15",
   org.eclipse.viatra.examples.cps.queries,
   org.eclipse.jdt.core;bundle-version="3.10.0",
   org.eclipse.text,
-  org.eclipse.xtend.lib;bundle-version="2.9.0",
+  org.eclipse.xtend.lib,
   org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,3.0.0)",
   org.eclipse.viatra.transformation.evm
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
index 20eb0e9..1fb3723 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.m2t</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
index 63d30f2..0ad8d9d 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator eclipse based serializer
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.eclipse
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
index a39c8f4..6c38935 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.eclipse</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
index 9097e1a..9cc78a4 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator java i/o based serializer
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.javaio
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
index 26db495..1395a8c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer.javaio</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
index d6a4f08..7dc326b 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CPS Demonstrator serializer API
 Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: IncQueryLabs Ltd.
 Export-Package: org.eclipse.viatra.examples.cps.xform.serializer
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
index c3f383a..4cf7901 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
     <groupId>org.eclipse.viatra.examples.cps</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.viatra.examples.cps.xform.serializer</artifactId>