Merge branch 'hotfix/2.3.0_fix1'

de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF

@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)",
  org.eclipse.core.databinding.beans;bundle-version="[1.1.1,2.0.0)",
  org.eclipse.gef;bundle-version="[3.7.0,4.0.0)",
- de.prob.core;bundle-version="[9.1.0,9.3.0)",
+ de.prob.core;bundle-version="[9.2.0,9.3.0)",
  org.eventb.core;bundle-version="[2.1.0,2.5.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

de.bmotionstudio.rodin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BMotion Studio Rodin Integration
 Bundle-SymbolicName: de.bmotionstudio.rodin;singleton:=true
-Bundle-Version: 1.0.1
+Bundle-Version: 1.0.2
 Fragment-Host: de.bmotionstudio.gef.editor;bundle-version="5.2.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: HHU Düsseldorf STUPS Group

de.prob.plugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ProB Rodin2 UI Bindings
 Bundle-SymbolicName: de.prob.plugin;singleton:=true
-Bundle-Version: 2.1.2
-Fragment-Host: de.prob.ui;bundle-version="[7.1.0,7.3.0)"
+Bundle-Version: 2.1.3
+Fragment-Host: de.prob.ui;bundle-version="[7.2.0,7.3.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: HHU Düsseldorf STUPS Group

de.prob.ui/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- de.prob.core;bundle-version="[9.1.0,9.3.0)",
+ de.prob.core;bundle-version="[9.2.0,9.3.0)",
  org.eventb.core;bundle-version="[2.1.0,2.5.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)",
  org.eclipse.gef;bundle-version="[3.5.0,4.0.0)"

de.prob2.feature/feature.xml

@@ -224,29 +224,24 @@ litigation.
    </license>
 
    <requires>
-      <import plugin="fr.systerel.explorer" version="1.3.2" match="equivalent"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.views" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.jface" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
       <import plugin="org.eclipse.jface.databinding" version="1.2.1" match="compatible"/>
       <import plugin="org.eclipse.core.databinding.beans" version="1.1.1" match="compatible"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.4.1" match="compatible"/>
-      <import plugin="de.prob.ui" version="7.1.0" match="equivalent"/>
-      <import plugin="de.prob.core" version="9.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.4.1" match="compatible"/>
-      <import plugin="org.rodinp.core" version="1.3.1"/>
-      <import plugin="org.eclipse.gef" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.gef" version="3.7.0" match="compatible"/>
+      <import plugin="de.prob.core" version="9.2.0" match="equivalent"/>
       <import plugin="org.eventb.core" version="2.1.0"/>
-      <import plugin="org.rodinp.keyboard" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.jface" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.rodinp.core" version="1.3.1"/>
+      <import plugin="de.prob.ui" version="7.2.0" match="equivalent"/>
       <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/>
+      <import plugin="org.eclipse.gef" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="de.bmotionstudio.gef.editor" version="5.2.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin