Merge changes I0aa70855,If367eb82
* changes:
[561118] Updates broken RCPTT tests
[545046] Updates Maven plugin configuration
diff --git a/documentation/org.eclipse.viatra.documentation.example/META-INF/MANIFEST.MF b/documentation/org.eclipse.viatra.documentation.example/META-INF/MANIFEST.MF
index 33a514a..7fe27c5 100644
--- a/documentation/org.eclipse.viatra.documentation.example/META-INF/MANIFEST.MF
+++ b/documentation/org.eclipse.viatra.documentation.example/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.emf.codegen,
org.eclipse.emf.codegen.ecore,
org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.0.0",
- org.eclipse.collections;bundle-version="10.2.0"
+ org.eclipse.collections;bundle-version="10.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
Automatic-Module-Name: org.eclipse.viatra.documentation.example
diff --git a/integration/plugins/org.eclipse.viatra.integration.zest/META-INF/MANIFEST.MF b/integration/plugins/org.eclipse.viatra.integration.zest/META-INF/MANIFEST.MF
index 68fa57e..54f6ee2 100644
--- a/integration/plugins/org.eclipse.viatra.integration.zest/META-INF/MANIFEST.MF
+++ b/integration/plugins/org.eclipse.viatra.integration.zest/META-INF/MANIFEST.MF
@@ -6,14 +6,14 @@
Bundle-Vendor: Eclipse VIATRA Project
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
- org.eclipse.gef.graph;bundle-version="5.0.0",
- org.eclipse.gef.zest.fx;bundle-version="5.0.0",
- org.eclipse.gef.mvc.fx;bundle-version="5.0.0",
+ org.eclipse.gef.zest.fx.jface;bundle-version="5.1.1",
+ org.eclipse.gef.graph;bundle-version="5.1.0",
+ org.eclipse.gef.zest.fx;bundle-version="5.1.1",
+ org.eclipse.gef.mvc.fx;bundle-version="5.2.0",
org.eclipse.gef.layout;bundle-version="5.0.0",
- org.eclipse.gef.fx.swt;bundle-version="5.0.0",
- org.eclipse.gef.common;bundle-version="5.0.0",
- org.eclipse.gef.fx;bundle-version="5.0.0"
+ org.eclipse.gef.fx.swt;bundle-version="5.0.2",
+ org.eclipse.gef.common;bundle-version="5.0.1",
+ org.eclipse.gef.fx;bundle-version="5.0.3"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: com.google.common.collect;version="27.1.0",
diff --git a/query/features/org.eclipse.viatra.query.sdk.extensions.feature/feature.xml b/query/features/org.eclipse.viatra.query.sdk.extensions.feature/feature.xml
index a6961dd..b26c70f 100644
--- a/query/features/org.eclipse.viatra.query.sdk.extensions.feature/feature.xml
+++ b/query/features/org.eclipse.viatra.query.sdk.extensions.feature/feature.xml
@@ -26,6 +26,7 @@
<includes
id="org.eclipse.viatra.transformation.debug.feature"
version="0.0.0"/>
+
<includes
id="org.eclipse.viatra.addon.viewers.runtime.zest.feature"
version="2.4.0.qualifier"
@@ -36,9 +37,9 @@
<import feature="org.eclipse.jdt"/>
<import feature="org.eclipse.pde"/>
<import feature="org.eclipse.viatra.addon.viewers.runtime.zest.feature" version="2.4.0" match="compatible"/>
- <import feature="org.eclipse.gef.graph" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.gef.graph" version="5.1.0" match="compatible"/>
<import feature="org.eclipse.gef.layout" version="5.0.0" match="compatible"/>
- <import feature="org.eclipse.gef.zest.fx.jface" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.gef.zest.fx.jface" version="5.1.1" match="compatible"/>
</requires>
<plugin
@@ -68,4 +69,5 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
</feature>
diff --git a/query/plugins/org.eclipse.viatra.query.runtime.matchers/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.runtime.matchers/META-INF/MANIFEST.MF
index 73b089a..77a3f7e 100644
--- a/query/plugins/org.eclipse.viatra.query.runtime.matchers/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.runtime.matchers/META-INF/MANIFEST.MF
@@ -41,5 +41,5 @@
org.eclipse.viatra.query.runtime.matchers.util.timeline
Bundle-ClassPath: .
Import-Package: org.apache.log4j;version="1.2.15"
-Require-Bundle: org.eclipse.collections;bundle-version="10.2.0"
+Require-Bundle: org.eclipse.collections;bundle-version="10.1.0"
Automatic-Module-Name: org.eclipse.viatra.query.runtime.matchers
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
index 2ac285c..1828105 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
@@ -19,9 +19,9 @@
org.eclipse.core.expressions,
org.eclipse.viatra.integration.zest;bundle-version="[2.4.0,2.5.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",
- org.eclipse.gef.mvc.fx;bundle-version="5.0.0",
+ org.eclipse.gef.zest.fx;bundle-version="5.1.1",
+ org.eclipse.gef.zest.fx.jface;bundle-version="5.1.1",
+ org.eclipse.gef.mvc.fx;bundle-version="5.2.0",
com.google.inject;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.eclipse.viatra.query.tooling.localsearch.ui.LocalSearchToolingActivator
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
index c5f7cc1..7d9223c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@
org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
org.eclipse.gef.mvc.fx;bundle-version="5.0.0",
com.google.inject;bundle-version="3.0.0",
- org.eclipse.gef.graph;bundle-version="5.0.0",
- org.eclipse.gef.common;bundle-version="5.0.0",
- org.eclipse.gef.fx;bundle-version="5.0.0",
- org.eclipse.gef.fx.swt;bundle-version="5.0.0",
+ org.eclipse.gef.graph;bundle-version="5.1.0",
+ org.eclipse.gef.common;bundle-version="5.0.1",
+ org.eclipse.gef.fx;bundle-version="5.0.3",
+ org.eclipse.gef.fx.swt;bundle-version="5.0.2",
org.eclipse.gef.layout;bundle-version="5.0.0",
org.eclipse.viatra.query.patternlanguage.emf;bundle-version="[2.4.0,2.5.0)",
org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.4.0,2.5.0)",
diff --git a/releng/org.eclipse.viatra.setup/VIATRAEMF.setup b/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
index af886d3..51cf86f 100644
--- a/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
+++ b/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
@@ -182,6 +182,8 @@
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
<repository
url="http://download.eclipse.org/efxclipse/updates-released/3.5.0/site"/>
+ <repository
+ url="https://download.eclipse.org/tools/gef/updates/releases/5.3.0_gef-master_5721/"/>
</repositoryList>
<repositoryList
name="2019-09">
@@ -191,6 +193,8 @@
url="http://download.eclipse.org/cbi/updates/license"/>
<repository
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="https://download.eclipse.org/tools/gef/updates/releases/5.3.0_gef-master_5721/"/>
</repositoryList>
<repositoryList
name="2019-12">
diff --git a/releng/org.eclipse.viatra.target.all/org.eclipse.viatra.target.all.target b/releng/org.eclipse.viatra.target.all/org.eclipse.viatra.target.all.target
index eeaaf26..90b6f90 100644
--- a/releng/org.eclipse.viatra.target.all/org.eclipse.viatra.target.all.target
+++ b/releng/org.eclipse.viatra.target.all/org.eclipse.viatra.target.all.target
@@ -47,11 +47,14 @@
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.1.201905141505"/>
<unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.16.0.201906041401"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
-<unit id="org.eclipse.gef.graph.sdk.feature.group" version="5.1.0.201905091638"/>
-<unit id="org.eclipse.gef.layout.sdk.feature.group" version="5.0.0.201905091638"/>
-<unit id="org.eclipse.gef.zest.sdk.feature.group" version="5.1.0.201905091638"/>
<repository location="https://download.eclipse.org/releases/2019-06/201906191000/"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.gef.graph.sdk.feature.group" version="5.1.0.201912130302"/>
+<unit id="org.eclipse.gef.layout.sdk.feature.group" version="5.0.0.201912130302"/>
+<unit id="org.eclipse.gef.zest.sdk.feature.group" version="5.1.1.201912130302"/>
+<repository location="https://download.eclipse.org/tools/gef/updates/releases/5.3.0_gef-master_5721/" />
+</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.collections.feature.feature.group" version="10.1.0.v20200211-1558"/>
<repository location="http://download.eclipse.org/collections/10.2.0/repository"/>
