[530701][533416] Update CPS build with new VIATRA features

Change-Id: I1dffb21f2e17dd71afac7789325abcd2b6c4f6e3
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>

3 files changed, 14 insertions, 7 deletions

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 9e903f0..d9ec71e 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
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.viatra.examples.cps.model,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
- org.eclipse.viatra.integration.zest;bundle-version="[0.20.0,0.21.0)",
+ org.eclipse.viatra.integration.zest;bundle-version="[2.0.0,2.1.0)",
  org.eclipse.gef.layout;bundle-version="5.0.0",
  org.eclipse.gef.zest.fx;bundle-version="5.0.0",
  org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.viatra.examples.cps.model,
  org.eclipse.viatra.examples.cps.model.editor,
  org.eclipse.viatra.examples.cps.queries,
  com.google.guava;bundle-version="10.0.0",
- org.eclipse.viatra.addon.viewers.runtime;bundle-version="[0.20.0,0.21.0)",
- org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[0.20.0,0.21.0)"
+ org.eclipse.viatra.addon.viewers.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[2.0.0,2.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j;version="1.2.15"
 Automatic-Module-Name: org.eclipse.viatra.examples.cps.view
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 b64938b..17737bb 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
@@ -62,6 +62,13 @@
 						</metamodel>
 					</metamodels>
 				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.viatra</groupId>
+						<artifactId>viatra-query-language-extensions</artifactId>
+						<version>${viatra.compiler.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>
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 7815d4d..f349c50 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
@@ -126,16 +126,16 @@
       <feature id="org.eclipse.viatra.addon.databinding.runtime.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.addon.querybasedfeatures.runtime.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.addon.validation.runtime.feature" version="2.0.0.qualifier"/>
-      <feature id="org.eclipse.viatra.addon.viewers.runtime.feature" version="0.20.0.qualifier"/>
-      <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature" version="0.20.0.qualifier"/>
-      <feature id="org.eclipse.viatra.addon.viewers.tooling.feature" version="0.20.0.qualifier"/>
+      <feature id="org.eclipse.viatra.addon.viewers.runtime.feature" version="2.0.0.qualifier"/>
+      <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature" version="2.0.0.qualifier"/>
+      <feature id="org.eclipse.viatra.addon.viewers.tooling.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.query.language.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.query.runtime.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.query.sdk.feature" version="2.0.0.qualifier"/>
-      <feature id="org.eclipse.viatra.query.tooling.ui.visualization.feature" version="0.20.0.qualifier"/>
+      <feature id="org.eclipse.viatra.query.sdk.extensions.feature" version="0.20.0.qualifier"/>
       <feature id="org.eclipse.viatra.transformation.debug.feature" version="0.20.0.qualifier"/>
       <feature id="org.eclipse.viatra.transformation.evm.transactions.feature" version="2.0.0.qualifier"/>
       <feature id="org.eclipse.viatra.transformation.runtime.emf.feature" version="2.0.0.qualifier"/>